Refactoring library dependencies.

common/CMakeLists.txt

@@ -56,9 +56,14 @@ set( GAL_SRCS
 
 add_library( gal STATIC ${GAL_SRCS} )
 add_dependencies( gal shader_headers )
-
 add_dependencies( gal lib-dependencies )
-add_dependencies( shader_headers lib-dependencies )
+
+target_link_libraries( gal
+    ${GLEW_LIBRARIES}
+    ${CAIRO_LIBRARIES}
+    ${PIXMAN_LIBRARY}
+    ${OPENGL_LIBRARIES}
+)
 
 
 # Only for win32 cross compilation using MXE
@@ -247,7 +252,7 @@ set( COMMON_SRCS
     )
 add_library( common STATIC ${COMMON_SRCS} )
 add_dependencies( common lib-dependencies )
-
+target_link_libraries( common ${Boost_LIBRARIES} )
 
 set( PCB_COMMON_SRCS
     base_screen.cpp

cvpcb/CMakeLists.txt

@@ -117,26 +117,9 @@ target_link_libraries( cvpcb_kiface
     polygon
     gal
     ${wxWidgets_LIBRARIES}
-    ${OPENGL_LIBRARIES}
     ${GDI_PLUS_LIBRARIES}
-    ${GLEW_LIBRARIES}
-    ${CAIRO_LIBRARIES}
-    ${PIXMAN_LIBRARY}
-    ${OPENMP_LIBRARIES}
     )
 
-# Only for win32 cross compilation using MXE
-if( WIN32 AND MSYS AND CMAKE_CROSSCOMPILING )
-    target_link_libraries( cvpcb_kiface
-        opengl32
-        glu32
-        pixman-1
-        fontconfig
-        freetype
-        bz2
-        )
-endif()
-
 if( BUILD_GITHUB_PLUGIN )
     target_link_libraries( cvpcb_kiface github_plugin )
 endif()

gerbview/CMakeLists.txt

@@ -131,7 +131,6 @@ target_link_libraries( gerbview_kiface
     common
     polygon
     bitmaps
-    ${OPENGL_LIBRARIES}
     ${wxWidgets_LIBRARIES}
     ${GDI_PLUS_LIBRARIES}
     )

pagelayout_editor/CMakeLists.txt

@@ -100,7 +100,6 @@ target_link_libraries( pl_editor_kiface
     common
     polygon
     bitmaps
-    ${OPENGL_LIBRARIES}
     ${wxWidgets_LIBRARIES}
     ${GDI_PLUS_LIBRARIES}
     )

pcbnew/CMakeLists.txt

@@ -413,11 +413,7 @@ if( KICAD_SCRIPTING_MODULES )
         polygon
         bitmaps
         gal
-        ${GLEW_LIBRARIES}
-        ${CAIRO_LIBRARIES}
-        ${PIXMAN_LIBRARY}
         ${wxWidgets_LIBRARIES}
-        ${OPENGL_LIBRARIES}
         ${GDI_PLUS_LIBRARIES}
         ${PYTHON_LIBRARIES}
         ${PCBNEW_EXTRA_LIBS}
@@ -583,12 +579,8 @@ target_link_libraries( pcbnew_kiface
     idf3
     ${GITHUB_PLUGIN_LIBRARIES}
     ${wxWidgets_LIBRARIES}
-    ${OPENGL_LIBRARIES}
     ${GDI_PLUS_LIBRARIES}
     ${PYTHON_LIBRARIES}
-    ${GLEW_LIBRARIES}
-    ${CAIRO_LIBRARIES}
-    ${PIXMAN_LIBRARY}
     ${Boost_LIBRARIES}      # must follow GITHUB
     ${PCBNEW_EXTRA_LIBS}    # -lrt must follow Boost
     ${OPENMP_LIBRARIES}