tune the order of link libraries, based on estimated dependency sequence

4cbb5c5e · Dick Hollenbeck · bc48b850 · 4cbb5c5e · 4cbb5c5e · 4cbb5c5e
Commit 4cbb5c5e authored Jan 25, 2012 by Dick Hollenbeck
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 6 deletions

CMakeLists.txt cvpcb/CMakeLists.txt +2 -2

CMakeLists.txt eeschema/CMakeLists.txt +8 -2

CMakeLists.txt pcbnew/CMakeLists.txt +2 -2

No files found.
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@@ -94,11 +94,11 @@ target_link_libraries(cvpcb
    3d-viewer
    pcbcommon
    common
-    polygon
    bitmaps
+    polygon
    kbool
-    ${OPENGL_LIBRARIES}
    ${wxWidgets_LIBRARIES}
+    ${OPENGL_LIBRARIES}
    ${GDI_PLUS_LIBRARIES}
    )


--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -207,8 +207,14 @@ if(APPLE)
        ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
 endif(APPLE)

-target_link_libraries(eeschema common bitmaps kbool polygon ${wxWidgets_LIBRARIES}
-    ${GDI_PLUS_LIBRARIES})
+target_link_libraries(eeschema
+    common
+    bitmaps
+    polygon
+    kbool
+    ${wxWidgets_LIBRARIES}
+    ${GDI_PLUS_LIBRARIES}
+    )

 install(TARGETS eeschema
        DESTINATION ${KICAD_BIN}

--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -278,11 +278,11 @@ target_link_libraries(pcbnew
    3d-viewer
    pcbcommon
    common
-    polygon
    bitmaps
+    polygon
    kbool
-    ${OPENGL_LIBRARIES}
    ${wxWidgets_LIBRARIES}
+    ${OPENGL_LIBRARIES}
    ${GDI_PLUS_LIBRARIES}
    )