CMake: fix webp, fix silverlining earth file plugin

gwaldron · May 17, 2024 · c1bbd4b · c1bbd4b
1 parent 2e67670
commit c1bbd4b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/src/osgEarthDrivers/CMakeLists.txt b/src/osgEarthDrivers/CMakeLists.txt
@@ -26,14 +26,14 @@ add_subdirectory(sky_gl)
 add_subdirectory(sky_simple)
 add_subdirectory(template)
 add_subdirectory(terrainshader)
-add_subdirectory(webp)
 add_subdirectory(vdatum_egm2008)
 add_subdirectory(vdatum_egm84)
 add_subdirectory(vdatum_egm96)
 add_subdirectory(viewpoints)
+add_subdirectory(webp)
 add_subdirectory(zip)
 
-if(OSGEARTH_BUILD_SILVERLINING_NODEKIT)
+if(OSGEARTH_HAVE_SILVERLINING_NODEKIT)
     add_subdirectory(sky_silverlining)
 endif()
 

diff --git a/src/osgEarthDrivers/sky_silverlining/CMakeLists.txt b/src/osgEarthDrivers/sky_silverlining/CMakeLists.txt
@@ -1,8 +1,6 @@
-if(SILVERLINING_FOUND)
-    add_osgearth_plugin(
-        TARGET osgdb_osgearth_sky_silverlining
-        SOURCES
-            SilverLiningDriver.cpp
-        LIBRARIES
-            osgEarthSilverLining )
-endif()
+add_osgearth_plugin(
+    TARGET osgdb_osgearth_sky_silverlining
+    SOURCES
+        SilverLiningDriver.cpp
+    LIBRARIES
+        osgEarthSilverLining )
diff --git a/src/osgEarthDrivers/webp/CMakeLists.txt b/src/osgEarthDrivers/webp/CMakeLists.txt
@@ -1,7 +1,11 @@
-if(WEBP_FOUND)
-    include_directories( ${WEBP_INCLUDE_DIR} )
+find_package(WEBP)
+
+if (WEBP_FOUND)
+    message(STATUS "Found WebP ${WEBP_VERSION}")
+    include_directories(${WEBP_INCLUDE_DIRS})
     add_osgearth_plugin(
         TARGET osgdb_webp
-        SOURCES ReaderWriterWebP.cpp )
-endif(WEBP_FOUND)
+        SOURCES ReaderWriterWebP.cpp
+        LIBRARIES ${WEBP_LIBRARIES})
+endif()