Changed all use of TARGET_LINK_LIBRARIES in OsgEarthMacroUtils to spe…

…cify private linking to avoid polluting projects with extra dependencies because the default was PUBLIC and it was making projects link against projects they didn't actually need to. Cleaned up projects so that dependencies that were getting pulled in by the previous default public linkage are now explicitly defined. Including CESIUM_NATIVE_INCLUDE_DIR with BEFORE to ensure that the cesium copy of spdlog is included and not the one osgearth is linking against. Including lerc include with BEFORE to pick up the right include directory.
gwaldron · Oct 20, 2023 · 6ac221f · 6ac221f
1 parent a1bae9d
commit 6ac221f
Show file tree

Hide file tree

Showing 61 changed files with 94 additions and 61 deletions.
diff --git a/CMakeModules/OsgEarthMacroUtils.cmake b/CMakeModules/OsgEarthMacroUtils.cmake
@@ -94,23 +94,23 @@ MACRO(LINK_WITH_VARIABLES TRGTNAME)
     FOREACH(varname ${ARGN})
         IF(${varname}_DEBUG)
             IF(${varname}_RELEASE)
-                TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${${varname}_RELEASE}" debug "${${varname}_DEBUG}")
+                TARGET_LINK_LIBRARIES(${TRGTNAME} PRIVATE optimized "${${varname}_RELEASE}" debug "${${varname}_DEBUG}")
             ELSE(${varname}_RELEASE)
-                TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${${varname}}" debug "${${varname}_DEBUG}")
+                TARGET_LINK_LIBRARIES(${TRGTNAME} PRIVATE optimized "${${varname}}" debug "${${varname}_DEBUG}")
             ENDIF(${varname}_RELEASE)
         ELSE(${varname}_DEBUG)
-            TARGET_LINK_LIBRARIES(${TRGTNAME} ${${varname}} )
+            TARGET_LINK_LIBRARIES(${TRGTNAME} PRIVATE ${${varname}} )
         ENDIF(${varname}_DEBUG)
     ENDFOREACH(varname)
 ENDMACRO(LINK_WITH_VARIABLES TRGTNAME)
 
 MACRO(LINK_INTERNAL TRGTNAME)
-    TARGET_LINK_LIBRARIES(${TRGTNAME} ${ARGN})
+    TARGET_LINK_LIBRARIES(${TRGTNAME} PRIVATE ${ARGN})
 ENDMACRO(LINK_INTERNAL TRGTNAME)
 
 MACRO(LINK_EXTERNAL TRGTNAME)
     FOREACH(LINKLIB ${ARGN})
-        TARGET_LINK_LIBRARIES(${TRGTNAME} "${LINKLIB}" )
+        TARGET_LINK_LIBRARIES(${TRGTNAME} PRIVATE "${LINKLIB}" )
     ENDFOREACH(LINKLIB)
 ENDMACRO(LINK_EXTERNAL TRGTNAME)
 
@@ -174,7 +174,7 @@ MACRO(SETUP_LINK_LIBRARIES)
     ENDIF(TARGET_LIBRARIES_VARS)
 
     FOREACH(LINKLIB ${TARGET_EXTERNAL_LIBRARIES})
-            TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} ${LINKLIB})
+            TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} PRIVATE ${LINKLIB})
     ENDFOREACH(LINKLIB)
 ENDMACRO(SETUP_LINK_LIBRARIES)
 

diff --git a/src/applications/osgearth_3pv/CMakeLists.txt b/src/applications/osgearth_3pv/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_3pv.cpp )
 

diff --git a/src/applications/osgearth_annotation/CMakeLists.txt b/src/applications/osgearth_annotation/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGGA_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_annotation.cpp )
 

diff --git a/src/applications/osgearth_atlas/CMakeLists.txt b/src/applications/osgearth_atlas/CMakeLists.txt
@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
 
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGTEXT_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_atlas.cpp )
 

diff --git a/src/applications/osgearth_boundarygen/CMakeLists.txt b/src/applications/osgearth_boundarygen/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_H
     BoundaryUtil

diff --git a/src/applications/osgearth_city/CMakeLists.txt b/src/applications/osgearth_city/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGGA_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_city.cpp )
 

diff --git a/src/applications/osgearth_cluster/CMakeLists.txt b/src/applications/osgearth_cluster/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC
     osgearth_cluster.cpp)

diff --git a/src/applications/osgearth_collecttriangles/CMakeLists.txt b/src/applications/osgearth_collecttriangles/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY OPENGL_gl_LIBRARY)
 
 SET(TARGET_SRC
     osgearth_collecttriangles.cpp )

diff --git a/src/applications/osgearth_createtile/CMakeLists.txt b/src/applications/osgearth_createtile/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_createtile.cpp )
 

diff --git a/src/applications/osgearth_eci/CMakeLists.txt b/src/applications/osgearth_eci/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_eci.cpp )
 

diff --git a/src/applications/osgearth_ephemeris/CMakeLists.txt b/src/applications/osgearth_ephemeris/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_ephemeris.cpp )
 

diff --git a/src/applications/osgearth_featurefilter/CMakeLists.txt b/src/applications/osgearth_featurefilter/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_featurefilter.cpp )
 

diff --git a/src/applications/osgearth_features/CMakeLists.txt b/src/applications/osgearth_features/CMakeLists.txt
@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
 
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_features.cpp )
 

diff --git a/src/applications/osgearth_graticule/CMakeLists.txt b/src/applications/osgearth_graticule/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_graticule.cpp )
 

diff --git a/src/applications/osgearth_imgui/CMakeLists.txt b/src/applications/osgearth_imgui/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+set(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSG_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY OPENGL_gl_LIBRARY)
 
 set(TARGET_SRC osgearth_imgui.cpp)
 SETUP_IMGUI_APPLICATION(osgearth_imgui)
diff --git a/src/applications/osgearth_infinitescroll/CMakeLists.txt b/src/applications/osgearth_infinitescroll/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_infinitescroll.cpp )
 

diff --git a/src/applications/osgearth_lights/CMakeLists.txt b/src/applications/osgearth_lights/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_lights.cpp )
 

diff --git a/src/applications/osgearth_los/CMakeLists.txt b/src/applications/osgearth_los/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_los.cpp )
 

diff --git a/src/applications/osgearth_magnify/CMakeLists.txt b/src/applications/osgearth_magnify/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGGA_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_magnify.cpp )
 

diff --git a/src/applications/osgearth_manip/CMakeLists.txt b/src/applications/osgearth_manip/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_manip.cpp )
 

diff --git a/src/applications/osgearth_map/CMakeLists.txt b/src/applications/osgearth_map/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_map.cpp )
 

diff --git a/src/applications/osgearth_minimap/CMakeLists.txt b/src/applications/osgearth_minimap/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_minimap.cpp )
 

diff --git a/src/applications/osgearth_mrt/CMakeLists.txt b/src/applications/osgearth_mrt/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_mrt.cpp )
 

diff --git a/src/applications/osgearth_occlusionculling/CMakeLists.txt b/src/applications/osgearth_occlusionculling/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_occlusionculling.cpp )
 

diff --git a/src/applications/osgearth_pick/CMakeLists.txt b/src/applications/osgearth_pick/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY)
+set(TARGET_LIBRARIES_VARS OPENTHREADS_LIBRARY OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENGL_gl_LIBRARY)
 set(TARGET_SRC osgearth_pick.cpp)
 
 SETUP_IMGUI_APPLICATION(osgearth_pick)
diff --git a/src/applications/osgearth_skyview/CMakeLists.txt b/src/applications/osgearth_skyview/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_H
     SkyManipulator

diff --git a/src/applications/osgearth_terrainprofile/CMakeLists.txt b/src/applications/osgearth_terrainprofile/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGGA_LIBRARY OSGUTIL_LIBRARY OSGTEXT_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_terrainprofile.cpp )
 

diff --git a/src/applications/osgearth_toc/CMakeLists.txt b/src/applications/osgearth_toc/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY OSGWIDGET_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY OSGWIDGET_LIBRARY)
 
 SET(TARGET_SRC osgearth_toc.cpp )
 

diff --git a/src/applications/osgearth_tracks/CMakeLists.txt b/src/applications/osgearth_tracks/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGGA_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_tracks.cpp )
 

diff --git a/src/applications/osgearth_transform/CMakeLists.txt b/src/applications/osgearth_transform/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_transform.cpp )
 

diff --git a/src/applications/osgearth_video/CMakeLists.txt b/src/applications/osgearth_video/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGGA_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_video.cpp )
 

diff --git a/src/applications/osgearth_viewer/CMakeLists.txt b/src/applications/osgearth_viewer/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGGA_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
 
 SET(TARGET_SRC osgearth_viewer.cpp )
 

diff --git a/src/osgEarth/CMakeLists.txt b/src/osgEarth/CMakeLists.txt
@@ -908,7 +908,7 @@ INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR} ${CURL_INCLUDE_DIR} ${OSG_INCLUDE_DIR} )
 
 # spdlog support?
 if (spdlog_FOUND)
-    link_internal(${LIB_NAME} spdlog::spdlog)
+    TARGET_LINK_LIBRARIES(${LIB_NAME} PRIVATE spdlog::spdlog)
     message(STATUS "Linking osgEarth with spdlog")
 endif()
 

diff --git a/src/osgEarthCesium/CMakeLists.txt b/src/osgEarthCesium/CMakeLists.txt
@@ -72,11 +72,14 @@ IF (TRACY_FOUND)
     LINK_WITH_VARIABLES(${LIB_NAME} TRACY_LIBRARY)
 ENDIF(TRACY_FOUND)
 
-INCLUDE_DIRECTORIES(${CESIUM_NATIVE_INCLUDE_DIR})
+# Include the Cesium Native headers BEFORE anything else to ensure that dependencies that might be duplicated like spdlog are included from the Cesium Native headers.
+INCLUDE_DIRECTORIES(BEFORE ${CESIUM_NATIVE_INCLUDE_DIR})
+
 LINK_WITH_VARIABLES(${LIB_NAME}
                     OSG_LIBRARY
                     OSGUTIL_LIBRARY
                     OSGDB_LIBRARY
+                    OSGTEXT_LIBRARY
                     CESIUM_NATIVE_3DTILES_LIBRARY                    
                     CESIUM_NATIVE_3DTILES_SELECTION_LIBRARY
                     CESIUM_NATIVE_UTILITY_LIBRARY

diff --git a/src/osgEarthDrivers/bumpmap/CMakeLists.txt b/src/osgEarthDrivers/bumpmap/CMakeLists.txt
@@ -31,9 +31,10 @@ set(LIB_PUBLIC_HEADERS
 set(TARGET_H
 	${LIB_PUBLIC_HEADERS}
 	BumpMapShaders )
+
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OPENTHREADS_LIBRARY) 
 
 setup_plugin(osgearth_bumpmap)
 
 # to install public driver includes:
 set(LIB_NAME bumpmap)
-
diff --git a/src/osgEarthDrivers/cache_filesystem/CMakeLists.txt b/src/osgEarthDrivers/cache_filesystem/CMakeLists.txt
@@ -5,11 +5,12 @@ SET(TARGET_H
 SET(TARGET_SRC 
     FileSystemCache.cpp
 )
-SETUP_PLUGIN(osgearth_cache_filesystem)
 
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OPENTHREADS_LIBRARY) 
+
+SETUP_PLUGIN(osgearth_cache_filesystem)
 
 # to install public driver includes:
 SET(LIB_NAME cache_filesystem)
 SET(LIB_PUBLIC_HEADERS FileSystemCache)
 INCLUDE(ModuleInstallOsgEarthDriverIncludes OPTIONAL)
-
diff --git a/src/osgEarthDrivers/colorramp/CMakeLists.txt b/src/osgEarthDrivers/colorramp/CMakeLists.txt
@@ -4,11 +4,11 @@ SET(TARGET_H
 SET(TARGET_SRC 
     ColorRampTileSource.cpp
 )
-SETUP_PLUGIN(osgearth_colorramp)
 
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OPENTHREADS_LIBRARY) 
+SETUP_PLUGIN(osgearth_colorramp)
 
 # to install public driver includes:
 SET(LIB_NAME colorramp)
 SET(LIB_PUBLIC_HEADERS ColorRampOptions)
 INCLUDE(ModuleInstallOsgEarthDriverIncludes OPTIONAL)
-
diff --git a/src/osgEarthDrivers/detail/CMakeLists.txt b/src/osgEarthDrivers/detail/CMakeLists.txt
@@ -32,6 +32,8 @@ set(TARGET_H
 	${LIB_PUBLIC_HEADERS}
 	DetailShaders
 	)
+
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OPENTHREADS_LIBRARY) 
 
 setup_plugin(osgearth_detail)
 

diff --git a/src/osgEarthDrivers/draco/CMakeLists.txt b/src/osgEarthDrivers/draco/CMakeLists.txt
@@ -5,7 +5,8 @@ IF(draco_FOUND)
     )
 
     INCLUDE_DIRECTORIES( ${draco_INCLUDE_DIRS} )
-    SET(TARGET_LIBRARIES_VARS draco_LIBRARIES )
+    SET(TARGET_LIBRARIES_VARS draco_LIBRARIES OSG_LIBRARY OSGDB_LIBRARY OPENTHREADS_LIBRARY )
+
 
     #### end var setup  ###
     SETUP_PLUGIN(draco)

diff --git a/src/osgEarthDrivers/earth/CMakeLists.txt b/src/osgEarthDrivers/earth/CMakeLists.txt
@@ -19,6 +19,9 @@ SET(TARGET_SRC
     EarthFileSerializer1.cpp
     EarthFileSerializer2.cpp)
 
+
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OPENTHREADS_LIBRARY)
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DOSGEARTH_LIBRARY_POSTFIX=${CMAKE_DEBUG_POSTFIX}")
 SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DOSGEARTH_LIBRARY_POSTFIX=${CMAKE_RELEASE_POSTFIX}")
 SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DOSGEARTH_LIBRARY_POSTFIX=${CMAKE_RELWITHDEBINFO_POSTFIX}")

diff --git a/src/osgEarthDrivers/engine_rex/CMakeLists.txt b/src/osgEarthDrivers/engine_rex/CMakeLists.txt
@@ -26,6 +26,8 @@ configure_shaders(
     ${SHADERS_CPP}
     ${TARGET_GLSL} )
 
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGTEXT_LIBRARY OPENTHREADS_LIBRARY OPENGL_gl_LIBRARY) 
+
 SET(TARGET_SRC
     CreateTileImplementation.cpp
     DrawState.cpp

diff --git a/src/osgEarthDrivers/fastdxt/CMakeLists.txt b/src/osgEarthDrivers/fastdxt/CMakeLists.txt
@@ -19,6 +19,8 @@ IF(WIN32)
     ENDIF(CURL_IS_STATIC)
 ENDIF(WIN32)
 
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OPENTHREADS_LIBRARY)
+
 SET(TARGET_H
     dxt.h
     libdxt.h

diff --git a/src/osgEarthDrivers/featurefilter_intersect/CMakeLists.txt b/src/osgEarthDrivers/featurefilter_intersect/CMakeLists.txt
@@ -6,9 +6,12 @@ SET(TARGET_H
     IntersectFeatureFilterOptions
 )
 
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OPENTHREADS_LIBRARY) 
+
 SETUP_PLUGIN(osgearth_featurefilter_intersect)
 
 # to install public driver includes:
 SET(LIB_NAME featurefilter_intersect)
 SET(LIB_PUBLIC_HEADERS ${TARGET_H})
+
 INCLUDE(ModuleInstallOsgEarthDriverIncludes OPTIONAL)
diff --git a/src/osgEarthDrivers/featurefilter_join/CMakeLists.txt b/src/osgEarthDrivers/featurefilter_join/CMakeLists.txt
@@ -6,6 +6,7 @@ SET(TARGET_H
     JoinFeatureFilterOptions
 )
 
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OPENTHREADS_LIBRARY) 
 SETUP_PLUGIN(osgearth_featurefilter_join)
 
 # to install public driver includes: