CMAKE WIP

gwaldron · May 6, 2024 · 9dd6e8e · 9dd6e8e
1 parent 568bdd4
commit 9dd6e8e
Show file tree

Hide file tree

Showing 30 changed files with 39 additions and 62 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ project(
     OSGEARTH
     DESCRIPTION "osgEarth 3D Geospatial SDK"
     HOMEPAGE_URL "https://github.com/gwaldron/osgearth"
-    LANGUAGES CXX)
+    LANGUAGES CXX C)
 
 # SDK version number
 set(OSGEARTH_MAJOR_VERSION 3)

diff --git a/cmake/osgearth-macros.cmake b/cmake/osgearth-macros.cmake
@@ -7,8 +7,7 @@ macro(detect_osg_version)
     if(OSG_DIR AND NOT OSG_INCLUDE_DIR AND EXISTS "${OSG_DIR}/include/osg/Version")
         set(OSG_INCLUDE_DIR "${OSG_DIR}/include")
     endif()
-
-    OPTION(APPEND_OPENSCENEGRAPH_VERSION "Append the OSG version number to the osgPlugins directory" ON)
+    option(APPEND_OPENSCENEGRAPH_VERSION "Append the OSG version number to the osgPlugins directory" ON)
 
     # Try to ascertain the version...
     # (Taken from CMake's FindOpenSceneGraph.cmake)
@@ -61,18 +60,16 @@ macro(detect_osg_version)
                 "Detected version ${OPENSCENEGRAPH_VERSION}")
         endif()
     endif()
-
-	MARK_AS_ADVANCED(OPENSCENEGRAPH_VERSION)
+	mark_as_advanced(OPENSCENEGRAPH_VERSION)
 
 
-    IF (APPEND_OPENSCENEGRAPH_VERSION AND OPENSCENEGRAPH_VERSION)
+    if(APPEND_OPENSCENEGRAPH_VERSION AND OPENSCENEGRAPH_VERSION)
         SET(OSG_PLUGINS "osgPlugins-${OPENSCENEGRAPH_VERSION}"  CACHE STRING "" FORCE)
         #MESSAGE(STATUS "Plugins will be installed under osgPlugins-${OPENSCENEGRAPH_VERSION} directory.")
-	else (APPEND_OPENSCENEGRAPH_VERSION AND OPENSCENEGRAPH_VERSION)
+	else()
 		SET(OSG_PLUGINS  CACHE STRING "" FORCE)
-    ENDIF(APPEND_OPENSCENEGRAPH_VERSION AND OPENSCENEGRAPH_VERSION)
-
-	MARK_AS_ADVANCED(OSG_PLUGINS)
+    endif()
+	mark_as_advanced(OSG_PLUGINS)
 
 endmacro(detect_osg_version)
 
@@ -85,7 +82,7 @@ endmacro(detect_osg_version)
 #
 # example usage:
 #
-#   add_osgearth_library_as_plugin(
+#   add_osgearth_plugin(
 #       TARGET [name of plugin with osgdb_ or osgdb_osgearth_ prefix]
 #       HEADERS [list of header files to include in the project]
 #       PUBLIC_HEADERS [list of header files to install]
@@ -97,7 +94,7 @@ endmacro(detect_osg_version)
 #
 # Note: osgEarth and OpenScenegraph libraries will automatically link to all plugins.
 #
-macro(add_osgearth_library_as_plugin)
+macro(add_osgearth_plugin)
 
     set(options "")
     set(oneValueArgs TARGET)

diff --git a/src/osgEarthDrivers/basis/CMakeLists.txt b/src/osgEarthDrivers/basis/CMakeLists.txt
@@ -1,11 +1,9 @@
-
 #find_package(BASISU)
 
 if(BASISU_FOUND)
-
-    add_osgearth_library_as_plugin(TARGET osgdb_basis
-        INCLUDE_DIRECTORIES ${BASISU_INCLUDE_DIR}
+    add_osgearth_plugin(
+        TARGET osgdb_basis
         SOURCES ReaderWriterBasis.cpp
+        INCLUDE_DIRECTORIES ${BASISU_INCLUDE_DIR}
         LIBRARIES ${BASISU_TRANSCODER_LIBRARY})
-
 endif()
diff --git a/src/osgEarthDrivers/bumpmap/CMakeLists.txt b/src/osgEarthDrivers/bumpmap/CMakeLists.txt
@@ -15,23 +15,7 @@ configure_shaders(
     ${SHADERS_CPP}
     ${TARGET_GLSL} )
 
-# set(TARGET_SRC
-	# BumpMapExtension.cpp
-	# BumpMapTerrainEffect.cpp
-	# ${SHADERS_CPP} )
-
-# set(TARGET_H_PUBLIC
-	# BumpMapExtension
-	# BumpMapOptions
-	# BumpMapTerrainEffect)
-
-# set(TARGET_H
-	# ${TARGET_H_PUBLIC}
-	# BumpMapShaders )
-
-# add_osgearth_library_as_plugin(osgdb_osgearth_bumpmap)
-
-add_osgearth_library_as_plugin(TARGET osgdb_osgearth_bumpmap
+add_osgearth_plugin(TARGET osgdb_osgearth_bumpmap
     PUBLIC_HEADERS
         BumpMapExtension
         BumpMapOptions
@@ -47,4 +31,3 @@ add_osgearth_library_as_plugin(TARGET osgdb_osgearth_bumpmap
     SHADERS
         ${TARGET_GLSL} )
 
-
diff --git a/src/osgEarthDrivers/cache_filesystem/CMakeLists.txt b/src/osgEarthDrivers/cache_filesystem/CMakeLists.txt
@@ -1,5 +1,4 @@
-
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_osgearth_cache_filesystem
     SOURCES
         FileSystemCache.cpp

diff --git a/src/osgEarthDrivers/cache_rocksdb/CMakeLists.txt b/src/osgEarthDrivers/cache_rocksdb/CMakeLists.txt
@@ -24,7 +24,7 @@ if(RocksDB_FOUND)
 
     #add_library_as_osgdb_plugin(osgdb_osgearth_cache_rocksdb)
 
-    add_osgearth_library_as_plugin(
+    add_osgearth_plugin(
         TARGET 
             osgdb_osgearth_cache_rocksdb
         PUBLIC_HEADERS

diff --git a/src/osgEarthDrivers/colorramp/CMakeLists.txt b/src/osgEarthDrivers/colorramp/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_osgearth_colorramp
     PUBLIC_HEADERS ColorRampOptions
     SOURCES ColorRampTileSource.cpp)
diff --git a/src/osgEarthDrivers/detail/CMakeLists.txt b/src/osgEarthDrivers/detail/CMakeLists.txt
@@ -16,7 +16,7 @@ configure_shaders(
     ${SHADERS_CPP}
     ${TARGET_GLSL} )
 
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_osgearth_detail
     SOURCES
         DetailPlugin.cpp

diff --git a/src/osgEarthDrivers/draco/CMakeLists.txt b/src/osgEarthDrivers/draco/CMakeLists.txt
@@ -1,7 +1,7 @@
 find_package(draco)
 
 if(draco_FOUND)
-    add_osgearth_library_as_plugin(
+    add_osgearth_plugin(
         TARGET osgdb_draco
         SOURCES ReaderWriterDraco.cpp
         LIBRARIES draco::draco)

diff --git a/src/osgEarthDrivers/earth/CMakeLists.txt b/src/osgEarthDrivers/earth/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_earth
     SOURCES
         ReaderWriterOsgEarth.cpp

diff --git a/src/osgEarthDrivers/engine_rex/CMakeLists.txt b/src/osgEarthDrivers/engine_rex/CMakeLists.txt
@@ -74,7 +74,7 @@ SET(TARGET_H
 	SelectionInfo
 )
 
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_osgearth_engine_rex
     HEADERS ${TARGET_H}
     SOURCES ${TARGET_SRC}

diff --git a/src/osgEarthDrivers/fastdxt/CMakeLists.txt b/src/osgEarthDrivers/fastdxt/CMakeLists.txt
@@ -1,7 +1,7 @@
 option(OSGEARTH_ENABLE_FASTDXT "Set to ON to build optional FastDXT image compressor." ON)
 if(OSGEARTH_ENABLE_FASTDXT)
 
-    add_osgearth_library_as_plugin(
+    add_osgearth_plugin(
         TARGET osgdb_fastdxt
         HEADERS 
             dxt.h

diff --git a/src/osgEarthDrivers/featurefilter_intersect/CMakeLists.txt b/src/osgEarthDrivers/featurefilter_intersect/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_osgearth_featurefilter_intersect
     PUBLIC_HEADERS
         IntersectFeatureFilterOptions

diff --git a/src/osgEarthDrivers/featurefilter_join/CMakeLists.txt b/src/osgEarthDrivers/featurefilter_join/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_osgearth_featurefilter_join
     PUBLIC_HEADERS
         JoinFeatureFilterOptions

diff --git a/src/osgEarthDrivers/gltf/CMakeLists.txt b/src/osgEarthDrivers/gltf/CMakeLists.txt
@@ -9,7 +9,7 @@ SET(TARGET_SRC
     ReaderWriterGLTF.cpp
 )
 
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_gltf
     HEADERS ${TARGET_H}
     SOURCES ${TARGET_SRC} )

diff --git a/src/osgEarthDrivers/kml/CMakeLists.txt b/src/osgEarthDrivers/kml/CMakeLists.txt
@@ -67,7 +67,7 @@ SET(TARGET_SRC
     KMZArchive.cpp
 )
 
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_kml
     HEADERS ${TARGET_H}
     PUBLIC_HEADERS KML KMLOptions

diff --git a/src/osgEarthDrivers/lerc/CMakeLists.txt b/src/osgEarthDrivers/lerc/CMakeLists.txt
@@ -1,6 +1,6 @@
 include_directories(BEFORE ../../third_party/lerc/include )
 
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_lerc
     SOURCES
         ReaderWriterLERC.cpp

diff --git a/src/osgEarthDrivers/script_engine_duktape/CMakeLists.txt b/src/osgEarthDrivers/script_engine_duktape/CMakeLists.txt
@@ -9,7 +9,7 @@ set(TARGET_SRC
     DuktapeEngine.cpp
     duktape.c )
 
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_osgearth_scriptengine_javascript
     HEADERS ${TARGET_H}
     SOURCES ${TARGET_SRC} )
diff --git a/src/osgEarthDrivers/sky_gl/CMakeLists.txt b/src/osgEarthDrivers/sky_gl/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_osgearth_sky_gl
     HEADERS
         GLSkyNode

diff --git a/src/osgEarthDrivers/sky_silverlining/CMakeLists.txt b/src/osgEarthDrivers/sky_silverlining/CMakeLists.txt
@@ -1,5 +1,5 @@
 if(SILVERLINING_FOUND)
-    add_osgearth_library_as_plugin(
+    add_osgearth_plugin(
         TARGET osgdb_osgearth_sky_silverlining
         SOURCES
             SilverLiningDriver.cpp

diff --git a/src/osgEarthDrivers/sky_simple/CMakeLists.txt b/src/osgEarthDrivers/sky_simple/CMakeLists.txt
@@ -57,7 +57,7 @@ set(INCLUDED_SRC_FILES
     eb_compute_shaders.cpp
     eb_osgearth_shaders.cpp)
 
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_osgearth_sky_simple
     SOURCES ${TARGET_SRC}
     HEADERS ${TARET_H}

diff --git a/src/osgEarthDrivers/template/CMakeLists.txt b/src/osgEarthDrivers/template/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_template
     HEADERS NLTemplate.h
     SOURCES ReaderWriterTemplate.cpp NLTemplate.cpp )

diff --git a/src/osgEarthDrivers/terrainshader/CMakeLists.txt b/src/osgEarthDrivers/terrainshader/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_osgearth_terrainshader
     PUBLIC_HEADERS
         TerrainShaderExtension

diff --git a/src/osgEarthDrivers/tileindex/CMakeLists.txt b/src/osgEarthDrivers/tileindex/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_osgearth_tileindex
     PUBLIC_HEADERS
         TileIndexOptions

diff --git a/src/osgEarthDrivers/vdatum_egm2008/CMakeLists.txt b/src/osgEarthDrivers/vdatum_egm2008/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_osgearth_vdatum_egm2008
     HEADERS EGM2008Grid.h
     SOURCES EGM2008.cpp )

diff --git a/src/osgEarthDrivers/vdatum_egm84/CMakeLists.txt b/src/osgEarthDrivers/vdatum_egm84/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_osgearth_vdatum_egm84
     HEADERS EGM84Grid.h
     SOURCES EGM84.cpp )

diff --git a/src/osgEarthDrivers/vdatum_egm96/CMakeLists.txt b/src/osgEarthDrivers/vdatum_egm96/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_osgearth_vdatum_egm96
     HEADERS EGM96Grid.h
     SOURCES EGM96.cpp )

diff --git a/src/osgEarthDrivers/viewpoints/CMakeLists.txt b/src/osgEarthDrivers/viewpoints/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_osgearth_library_as_plugin(
+add_osgearth_plugin(
     TARGET osgdb_osgearth_viewpoints
     PUBLIC_HEADERS
         ViewpointsExtension

diff --git a/src/osgEarthDrivers/webp/CMakeLists.txt b/src/osgEarthDrivers/webp/CMakeLists.txt
@@ -1,6 +1,6 @@
 if(WEBP_FOUND)
     include_directories( ${WEBP_INCLUDE_DIR} )
-    add_osgearth_library_as_plugin(
+    add_osgearth_plugin(
         TARGET osgdb_webp
         SOURCES ReaderWriterWebP.cpp )
 endif(WEBP_FOUND)

diff --git a/src/osgEarthDrivers/zip/CMakeLists.txt b/src/osgEarthDrivers/zip/CMakeLists.txt
@@ -6,7 +6,7 @@ if(LIBZIP_FOUND AND OSGEARTH_BUILD_ZIP_PLUGIN)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-implicit-fallthrough")
     endif()
 
-    add_osgearth_library_as_plugin(
+    add_osgearth_plugin(
         TARGET osgdb_zip
         HEADERS
             ZipArchive.h