Commit 499fc46e authored by Dick Hollenbeck's avatar Dick Hollenbeck

kicad CMakeList.txt library dependency order

parent fb7b03a6
...@@ -40,16 +40,29 @@ if(APPLE) ...@@ -40,16 +40,29 @@ if(APPLE)
endif(APPLE) endif(APPLE)
add_executable(kicad WIN32 MACOSX_BUNDLE add_executable(kicad WIN32 MACOSX_BUNDLE
${KICAD_SRCS} ${KICAD_SRCS}
${KICAD_EXTRA_SRCS} ${KICAD_EXTRA_SRCS}
${KICAD_RESOURCES} ${KICAD_RESOURCES}
) )
if(APPLE) if(APPLE)
set_target_properties(kicad PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) 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) 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) endif(APPLE)
install(TARGETS kicad install(TARGETS kicad
......
...@@ -57,8 +57,9 @@ endif(APPLE) ...@@ -57,8 +57,9 @@ endif(APPLE)
add_executable(pcb_calculator WIN32 MACOSX_BUNDLE add_executable(pcb_calculator WIN32 MACOSX_BUNDLE
${PCB_CALCULATOR_SRCS} ${PCB_CALCULATOR_SRCS}
${PCB_CALCULATOR_RESOURCES}) ${PCB_CALCULATOR_RESOURCES}
)
if(APPLE) if(APPLE)
...@@ -67,7 +68,10 @@ if(APPLE) ...@@ -67,7 +68,10 @@ if(APPLE)
endif(APPLE) endif(APPLE)
target_link_libraries( pcb_calculator target_link_libraries( pcb_calculator
common polygon bitmaps kbool common
bitmaps
polygon
kbool
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment