From 499fc46eb1a2de564a59f5cbe150e2fa71c71623 Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Fri, 27 Jan 2012 09:40:04 -0600 Subject: [PATCH] kicad CMakeList.txt library dependency order --- kicad/CMakeLists.txt | 25 +++++++++++++++++++------ pcb_calculator/CMakeLists.txt | 10 +++++++--- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt index 6944a31359..27b2cd20cf 100644 --- a/kicad/CMakeLists.txt +++ b/kicad/CMakeLists.txt @@ -40,16 +40,29 @@ if(APPLE) endif(APPLE) add_executable(kicad WIN32 MACOSX_BUNDLE - ${KICAD_SRCS} - ${KICAD_EXTRA_SRCS} - ${KICAD_RESOURCES} - ) + ${KICAD_SRCS} + ${KICAD_EXTRA_SRCS} + ${KICAD_RESOURCES} + ) if(APPLE) set_target_properties(kicad PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) - target_link_libraries(kicad common bitmaps kbool polygon ${wxWidgets_LIBRARIES}) + target_link_libraries(kicad + common + bitmaps + polygon + kbool + ${wxWidgets_LIBRARIES} + ) else(APPLE) - target_link_libraries(kicad common bitmaps kbool polygon ${wxWidgets_LIBRARIES} ${GDI_PLUS_LIBRARIES}) + target_link_libraries(kicad + common + bitmaps + polygon + kbool + ${wxWidgets_LIBRARIES} + ${GDI_PLUS_LIBRARIES} + ) endif(APPLE) install(TARGETS kicad diff --git a/pcb_calculator/CMakeLists.txt b/pcb_calculator/CMakeLists.txt index 100c0be875..48c71170f2 100644 --- a/pcb_calculator/CMakeLists.txt +++ b/pcb_calculator/CMakeLists.txt @@ -57,8 +57,9 @@ endif(APPLE) add_executable(pcb_calculator WIN32 MACOSX_BUNDLE - ${PCB_CALCULATOR_SRCS} - ${PCB_CALCULATOR_RESOURCES}) + ${PCB_CALCULATOR_SRCS} + ${PCB_CALCULATOR_RESOURCES} + ) if(APPLE) @@ -67,7 +68,10 @@ if(APPLE) endif(APPLE) target_link_libraries( pcb_calculator - common polygon bitmaps kbool + common + bitmaps + polygon + kbool ${wxWidgets_LIBRARIES} )