diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt
index 22272a1d34..fe9682e8ae 100644
--- 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}
     )
 
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 52c69437cc..a2a169a1de 100644
--- 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}
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 8f5d2d7d21..6b9cfef883 100644
--- 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}
     )