Update cmake with verbosity settings

gwaldron · May 28, 2024 · db26806 · db26806
1 parent 27557b4
commit db26806
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 38 deletions.
diff --git a/cmake/osgearth-macros.cmake b/cmake/osgearth-macros.cmake
@@ -343,7 +343,8 @@ macro(add_osgearth_library)
 
     # profiler:
     if(Tracy_FOUND)
-        target_link_libraries(${MY_TARGET} PUBLIC Tracy::TracyClient)    endif()
+        target_link_libraries(${MY_TARGET} PUBLIC Tracy::TracyClient)
+    endif()
 
     # soversions - append SO version to shared object files on unix (e.g., osgearth.so.123)
     if (OSGEARTH_SONAMES)

diff --git a/src/osgEarth/CMakeLists.txt b/src/osgEarth/CMakeLists.txt
@@ -14,16 +14,15 @@ find_package(GDAL REQUIRED)
 find_package(SQLite3 REQUIRED)
 
 # optional
-find_package(geos)
-find_package(Protobuf)
-find_package(WebP)
-find_package(blend2d)
-find_package(blosc)
-find_package(spdlog)
-find_package(meshoptimizer)
+find_package(geos QUIET)
+find_package(Protobuf QUIET)
+find_package(blend2d QUIET)
+find_package(blosc QUIET)
+find_package(spdlog QUIET)
+find_package(meshoptimizer QUIET)
 
 if(OSGEARTH_BUILD_ZIP_PLUGIN)
-    find_package(LibZip)
+    find_package(LibZip QUIET)
 endif()
 
 
@@ -821,10 +820,8 @@ endif()
 
 # generate the google protocol buffers headers and sources
 if(Protobuf_FOUND AND Protobuf_PROTOC_EXECUTABLE)
-
     PROTOBUF_GENERATE_CPP(PROTO_VECTOR_TILE_CPP PROTO_VECTOR_TILE_H vector_tile.proto) 
-    PROTOBUF_GENERATE_CPP(PROTO_GLYPHS_CPP PROTO_GLYPHS_H glyphs.proto)
-
+    PROTOBUF_GENERATE_CPP(PROTO_GLYPHS_CPP PROTO_GLYPHS_H glyphs.proto)    
     list(APPEND TARGET_H ${PROTO_VECTOR_TILE_H} ${PROTO_GLYPHS_H})
     list(APPEND TARGET_SRC ${PROTO_VECTOR_TILE_CPP} ${PROTO_GLYPHS_CPP})
 
@@ -859,6 +856,7 @@ add_osgearth_library(
 
 # google protocol buffers
 if(Protobuf_FOUND AND Protobuf_PROTOC_EXECUTABLE)
+    message(STATUS "Found protobuf")
     set(OSGEARTH_HAVE_PROTOBUF ON)
     set(OSGEARTH_HAVE_MVT ON)
 
@@ -867,18 +865,20 @@ if(Protobuf_FOUND AND Protobuf_PROTOC_EXECUTABLE)
         add_definitions(-DPROTOBUF_USE_DLLS)
     endif()
 
-    include_directories(${Protobuf_INCLUDE_DIR})
+    #include_directories(${Protobuf_INCLUDE_DIR})
     target_link_libraries(${LIB_NAME} PRIVATE protobuf::libprotobuf)
 endif()
 
 # spdlog support?
 if (spdlog_FOUND)
+    message(STATUS "Found spdlog")
     set(OSGEARTH_HAVE_SPDLOG ON)
     target_link_libraries(${LIB_NAME} PRIVATE spdlog::spdlog)
 endif()
 
 # MBTiles support?
 if(SQLite3_FOUND)
+    message(STATUS "Found SQLite3 - will support MBTiles")
     set(OSGEARTH_HAVE_SQLITE3 ON)
     set(OSGEARTH_HAVE_MBTILES ON)
     include_directories(${SQLite3_INCLUDE_DIR})
@@ -887,33 +887,38 @@ endif()
 
 # Blosc support?
 if(blosc_FOUND)
+    message(STATUS "Found blosc")
     set(OSGEARTH_HAVE_BLOSC ON)
     include_directories(${BLOSC_INCLUDE_DIR})
     target_link_libraries(${LIB_NAME} PRIVATE blosc_shared)
 endif()
 
 # GEOS support?
 if(geos_FOUND)
+    message(STATUS "Found geos")
     set(OSGEARTH_HAVE_GEOS ON)
     include_directories(${GEOS_INCLUDE_DIR})
     target_link_libraries(${LIB_NAME} PRIVATE GEOS::geos_c)
 endif()
 
 # Blend2D?
 if(blend2d_FOUND)
+    message(STATUS "Found blend2d")
     set(OSGEARTH_HAVE_BLEND2D ON)
     include_directories(${BLEND2D_INCLUDES})
     target_link_libraries(${LIB_NAME} PRIVATE blend2d::blend2d)
 endif()
 
 # Tracy?
 if (Tracy_FOUND)
+    message(STATUS "Found Tracy")
     set(OSGEARTH_HAVE_TRACY ON)
     target_link_libraries(${LIB_NAME} PRIVATE Tracy::TracyClient)
 endif()
 
 # mesh optimizer optional library?
 if(meshoptimizer_FOUND)
+    message(STATUS "Found meshoptimizer")
     set(OSGEARTH_HAVE_MESH_OPTIMIZER ON)
     target_link_libraries(${LIB_NAME} PRIVATE meshoptimizer::meshoptimizer)
 endif()

diff --git a/src/osgEarthDrivers/cache_rocksdb/CMakeLists.txt b/src/osgEarthDrivers/cache_rocksdb/CMakeLists.txt
@@ -1,28 +1,10 @@
-
-find_package(RocksDB)
+find_package(RocksDB QUIET)
 
 if(RocksDB_FOUND)
 
-    # set(LIB_NAME osgdb_osgearth_cache_rocksdb)
+    message(STATUS "Foudn rocksdb - will build rocks cache")
 
     set(CMAKE_CXX_STANDARD 17)
-
-    # set(TARGET_H_PUBLIC    
-        # RocksDBCacheOptions)
-
-    # set(TARGET_H
-        # ${TARGET_H_PUBLIC}
-        # RocksDBCache
-        # RocksDBCacheBin
-        # Tracker
-    # )
-    # set(TARGET_SRC 
-        # RocksDBCache.cpp
-        # RocksDBCacheBin.cpp
-        # RocksDBCacheDriver.cpp
-    # )
-
-    #add_library_as_osgdb_plugin(osgdb_osgearth_cache_rocksdb)
 
     add_osgearth_plugin(
         TARGET 
@@ -38,7 +20,6 @@ if(RocksDB_FOUND)
             RocksDBCacheBin.cpp
             RocksDBCacheDriver.cpp )
 
-
     target_link_libraries(osgdb_osgearth_cache_rocksdb
         PRIVATE RocksDB::rocksdb RocksDB::rocksdb-shared)    
 

diff --git a/src/osgEarthDrivers/draco/CMakeLists.txt b/src/osgEarthDrivers/draco/CMakeLists.txt
@@ -1,6 +1,7 @@
-find_package(draco)
+find_package(draco QUIET)
 
 if(draco_FOUND)
+    message(STATUS "Found draco")
     add_osgearth_plugin(
         TARGET osgdb_draco
         SOURCES ReaderWriterDraco.cpp

diff --git a/src/osgEarthDrivers/gltf/CMakeLists.txt b/src/osgEarthDrivers/gltf/CMakeLists.txt
@@ -19,6 +19,6 @@ include_directories(
     ${OSGEARTH_EMBEDDED_THIRD_PARTY_DIR}/rapidjson/include/rapidjson )
 
 if (draco_FOUND)
-    include_directories(${draco_INCLUDE_DIRS})
+    #include_directories(${draco_INCLUDE_DIRS})
     target_link_libraries(osgdb_gltf PRIVATE draco::draco)
 endif()
diff --git a/src/osgEarthDrivers/webp/CMakeLists.txt b/src/osgEarthDrivers/webp/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(WebP)
+find_package(WebP QUIET)
 
 if (WebP_FOUND)
     message(STATUS "Found WebP ${WEBP_VERSION}")
@@ -7,4 +7,3 @@ if (WebP_FOUND)
         SOURCES ReaderWriterWebP.cpp)
     target_link_libraries(osgdb_webp PRIVATE WebP::webp)
 endif()
-