build as an installable package and use vcpkg manifest mode to build standalone

CMakeLists.txt

@@ -4,12 +4,38 @@ if (NOT VCPKG_LIBRARY_LINKAGE)
     set(VCPKG_LIBRARY_LINKAGE static)
 endif()
 
-if(NOT VCPKG_MANIFEST_MODE)
+# Don't use ezvcpkg if it appears that this configuration is using
+# vcpkg already, either by building cesium-native directly,
+# or via a higher level project that has added cesium-native as a
+# subdirectory and using vcpkg to statisfy its dependencies,
+# presumably in manifest mode.
+
+set(CESIUM_USE_EZVCPKG_DEFAULT ON)
+if (VCPKG_MANIFEST_MODE)
+    set(CESIUM_USE_EZVCPKG_DEFAULT OFF)
+elseif (CMAKE_TOOLCHAIN_FILE)
+    get_filename_component(toolchainFile "${CMAKE_TOOLCHAIN_FILE}" NAME)
+    if(toolchainFile STREQUAL "vcpkg.cmake")
+        set(CESIUM_USE_EZVCPKG_DEFAULT OFF)
+    endif()
+endif()
+
+option(CESIUM_USE_EZVCPKG "use ezvcpkg helper" ${CESIUM_USE_EZVCPKG_DEFAULT})
+
+if(CESIUM_USE_EZVCPKG)
   include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/ezvcpkg/ezvcpkg.cmake)
 endif()
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/detect-vcpkg-triplet.cmake)
 
+# Note: VCPKG_TRIPLET is not used by vcpkg! The relevant variables are
+# VCPKG_TARGET_TRIPLET and VCPKG_HOST_TRIPLET. ezvcpkg and our custom
+# installation code use VCPKG_TRIPLET, so we initialize it.
+
+if (VCPKG_TARGET_TRIPLET)
+    set(VCPKG_TRIPLET "${VCPKG_TARGET_TRIPLET}")
+endif()
+
 if (NOT VCPKG_TRIPLET)
     if (DEFINED ENV{VCPKG_TRIPLET})
         set(VCPKG_TRIPLET "$ENV{VCPKG_TRIPLET}")
@@ -21,9 +47,13 @@ if (NOT VCPKG_TRIPLET)
     else()
         set(VCPKG_TRIPLET "${DETECTED_VCPKG_TRIPLET}")
     endif()
+    if (NOT CESIUM_USE_EZVCPKG)
+        set(VCPKG_TARGET_TRIPLET "${VCPKG_TRIPLET}")
+    endif()
 endif()
 
 message(STATUS "VCPKG_TRIPLET ${VCPKG_TRIPLET}")
+message(STATUS "VCPKG_TARGET_TRIPLET ${VCPKG_TARGET_TRIPLET}")
 
 if (NOT VCPKG_OVERLAY_PORTS)
     if (DEFINED ENV{VCPKG_OVERLAY_PORTS})
@@ -58,7 +88,7 @@ set(PACKAGES_PRIVATE
 # Packages only used for testing
 set(PACKAGES_TEST catch2)
 
-if(NOT VCPKG_MANIFEST_MODE)
+if(CESIUM_USE_EZVCPKG)
     set(PACKAGES_ALL ${PACKAGES_PUBLIC})
     list(APPEND PACKAGES_ALL ${PACKAGES_PRIVATE})
     list(APPEND PACKAGES_ALL ${PACKAGES_TEST})
@@ -95,7 +125,7 @@ include(CMakeDependentOption)
 set(PACKAGE_BASE_DIR "${EZVCPKG_PACKAGES_DIR}")
 set(PACKAGE_BUILD_DIR "${EZVCPKG_DIR}")
 
-if(VCPKG_MANIFEST_MODE)
+if(NOT EZVCPKG_PACKAGES_DIR)
     set(PACKAGE_BUILD_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TRIPLET}/")
     set(PACKAGE_BASE_DIR "$ENV{VCPKG_ROOT}/packages")
 endif()
@@ -116,7 +146,7 @@ cmake_dependent_option(
     OFF
 )
 
-if(CESIUM_INSTALL_STATIC_LIBS OR CESIUM_INSTALL_HEADERS)
+if(CESIUM_INSTALL_STATIC_LIBS OR CESIUM_INSTALL_HEADERS AND EZVCPKG_PACKAGES_DIR)
     foreach(PACKAGE ${PACKAGES_PUBLIC})
         string(REGEX REPLACE "\[.*\]" "" PACKAGE ${PACKAGE})
         set(PACKAGE_DIR ${PACKAGE_BASE_DIR}/${PACKAGE}_${VCPKG_TRIPLET})
@@ -138,7 +168,7 @@ if(CESIUM_INSTALL_STATIC_LIBS OR CESIUM_INSTALL_HEADERS)
     endforeach()
 endif()
 
-if(CESIUM_INSTALL_STATIC_LIBS)
+if(CESIUM_INSTALL_STATIC_LIBS AND NOT VCPKG_MANIFEST_MODE)
     foreach(PACKAGE ${PACKAGES_PRIVATE})
         set(PACKAGE_DIR ${PACKAGE_BASE_DIR}/${PACKAGE}_${VCPKG_TRIPLET})
         message(DEBUG "PACKAGE_DIR ${PACKAGE_DIR}")
@@ -205,6 +235,7 @@ if(CESIUM_ENABLE_CLANG_TIDY)
 endif()
 
 # Add Modules
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/extern/cmake-modules/")
 if (CESIUM_COVERAGE_ENABLED AND NOT MSVC)
     include(CodeCoverage)
@@ -238,6 +269,14 @@ list(APPEND CMAKE_PREFIX_PATH "${PACKAGE_BUILD_DIR}")
 # However, for some of the vcpkg built libraries where they don't provide a prope cmake config file, we have to declare
 # and imporeted library target ourselves. This is the case for modp_b64::modp_b64, picosha2::picosha2 and earcut. In
 # these cases, we *do* have the somewhat ugly and verbose details in the extern/CMakeLists.txt file.
+#
+# XXX Above comment should be obsoleted by these first calls to
+# find_package, which resolve to our own modules that provide
+# targets. If needed, they can be installed with CMake config files
+# etc.
+find_package(zlib-ng REQUIRED)
+find_package(modp_b64 REQUIRED)
+
 find_package(Async++ CONFIG REQUIRED)
 find_package(Catch2 CONFIG REQUIRED)
 find_package(draco CONFIG REQUIRED)
@@ -290,3 +329,21 @@ endif()
 
 
 add_subdirectory(doc)
+
+include(CMakePackageConfigHelpers)
+
+install(EXPORT CesiumExports
+  FILE cesium-nativeTargets.cmake
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/cesium-native/cmake)
+
+install(FILES
+  "${CMAKE_CURRENT_LIST_DIR}/cmake/modules/Findzlib-ng.cmake"
+  "${CMAKE_CURRENT_LIST_DIR}/cmake/modules/Findmodp_b64.cmake" 
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/cesium-native/cmake)
+
+configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config/Config.cmake.in
+  "${CMAKE_CURRENT_BINARY_DIR}/cesium-nativeConfig.cmake"
+  INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/cesium-native/cmake)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cesium-nativeConfig.cmake
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/cesium-native/cmake)

CMakePresets.json

@@ -0,0 +1,25 @@
+{
+  "version": 3,
+  "configurePresets": [
+    {
+      "name": "vcpkg",
+      "binaryDir": "${sourceDir}/build",
+      "generator": "Ninja",
+      "cacheVariables": {
+        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
+        "CMAKE_BUILD_TYPE": "Release",
+        "CESIUM_USE_EZVCPKG": "OFF"
+      }
+    },
+    {
+      "name": "vcpkg-ninja-multi",
+      "generator": "Ninja Multi-Config",
+      "binaryDir": "${sourceDir}/build",
+      "cacheVariables": {
+        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
+        "CMAKE_BUILD_TYPE": "Release",
+        "CESIUM_USE_EZVCPKG": "OFF"
+      }
+    }
+  ]
+}

Cesium3DTiles/CMakeLists.txt

@@ -36,16 +36,16 @@ target_sources(
     PRIVATE
         ${CESIUM_3DTILES_SOURCES}
         ${CESIUM_3DTILES_HEADERS}
-    PUBLIC
         ${CESIUM_3DTILES_PUBLIC_HEADERS}
 )
 
 cesium_target_include_directories(
     TARGET
         Cesium3DTiles
     PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/include
-        ${CMAKE_CURRENT_LIST_DIR}/generated/include
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/generated/include>
+        $<INSTALL_INTERFACE:include>
     PRIVATE
         ${CMAKE_CURRENT_LIST_DIR}/src
         ${CMAKE_CURRENT_LIST_DIR}/generated/src

Cesium3DTilesContent/CMakeLists.txt

@@ -37,7 +37,6 @@ target_sources(
     PRIVATE
         ${CESIUM_3DTILES_CONTENT_SOURCES}
         ${CESIUM_3DTILES_CONTENT_HEADERS}
-    PUBLIC
         ${CESIUM_3DTILES_CONTENT_PUBLIC_HEADERS}
 )
 

Cesium3DTilesReader/CMakeLists.txt

@@ -37,16 +37,16 @@ target_sources(
     PRIVATE
         ${CESIUM_3DTILES_READER_SOURCES}
         ${CESIUM_3DTILES_READER_HEADERS}
-    PUBLIC
         ${CESIUM_3DTILES_READER_PUBLIC_HEADERS}
 )
 
 cesium_target_include_directories(
     TARGET
         Cesium3DTilesReader
     PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/include
-        ${CMAKE_CURRENT_LIST_DIR}/generated/include
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/generated/include>
+        $<INSTALL_INTERFACE:include>
     PRIVATE
         ${CMAKE_CURRENT_LIST_DIR}/src
         ${CMAKE_CURRENT_LIST_DIR}/generated/src

Cesium3DTilesSelection/CMakeLists.txt

@@ -25,16 +25,19 @@ target_sources(
     PRIVATE
         ${CESIUM_3DTILES_SELECTION_SOURCES}
         ${CESIUM_3DTILES_SELECTION_HEADERS}
-    PUBLIC
         ${CESIUM_3DTILES_SELECTION_PUBLIC_HEADERS}
 )
 
 cesium_target_include_directories(
     TARGET 
         Cesium3DTilesSelection
     PUBLIC
-        ${CMAKE_BINARY_DIR}
-        ${CMAKE_CURRENT_LIST_DIR}/include
+        $<BUILD_INTERFACE:${CESIUM_NATIVE_RAPIDJSON_INCLUDE_DIR}>
+        $<BUILD_INTERFACE:${CESIUM_NATIVE_DRACO_INCLUDE_DIR}>
+        $<BUILD_INTERFACE:${CESIUM_NATIVE_LIBMORTON_INCUDE_DIR}>
+        $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+        $<INSTALL_INTERFACE:include>
     PRIVATE
         ${CMAKE_CURRENT_LIST_DIR}/src
 )

Cesium3DTilesSelection/src/TileID.cpp

@@ -15,14 +15,14 @@ TileIdUtilities::createTileIdString(const TileID& tileId) {
     std::string
     operator()(const CesiumGeometry::QuadtreeTileID& quadtreeTileId) {
       // Strings of the form "L10-X23-Y144"
-      return "L" + std::to_string(quadtreeTileId.level) + "-" + "X" +
-             std::to_string(quadtreeTileId.x) + "-" + "Y" +
+      return std::string("L") + std::to_string(quadtreeTileId.level) + "-" +
+             "X" + std::to_string(quadtreeTileId.x) + "-" + "Y" +
              std::to_string(quadtreeTileId.y);
     }
 
     std::string operator()(const CesiumGeometry::OctreeTileID& octreeTileId) {
       // Strings of the form "L10-X23-Y144-Z42"
-      return "L" + std::to_string(octreeTileId.level) + "-" + "X" +
+      return std::string("L") + std::to_string(octreeTileId.level) + "-" + "X" +
              std::to_string(octreeTileId.x) + "-" + "Y" +
              std::to_string(octreeTileId.y) + "-" + "Z" +
              std::to_string(octreeTileId.z);
@@ -31,7 +31,7 @@ TileIdUtilities::createTileIdString(const TileID& tileId) {
     std::string operator()(
         const CesiumGeometry::UpsampledQuadtreeNode& upsampledQuadtreeNode) {
       // Strings of the form "upsampled-L10-X23-Y144"
-      return "upsampled-L" +
+      return std::string("upsampled-L") +
              std::to_string(upsampledQuadtreeNode.tileID.level) + "-" + "X" +
              std::to_string(upsampledQuadtreeNode.tileID.x) + "-" + "Y" +
              std::to_string(upsampledQuadtreeNode.tileID.y);

Cesium3DTilesWriter/CMakeLists.txt

@@ -37,16 +37,16 @@ target_sources(
     PRIVATE
         ${CESIUM_3DTILES_WRITER_SOURCES}
         ${CESIUM_3DTILES_WRITER_HEADERS}
-    PUBLIC
         ${CESIUM_3DTILES_WRITER_PUBLIC_HEADERS}
 )
 
 cesium_target_include_directories(
     TARGET
         Cesium3DTilesWriter
     PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/include
-        ${CMAKE_CURRENT_LIST_DIR}/generated/include
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/generated/include>
+        $<INSTALL_INTERFACE:include>
     PRIVATE
         ${CMAKE_CURRENT_LIST_DIR}/src
         ${CMAKE_CURRENT_LIST_DIR}/generated/src

CesiumAsync/CMakeLists.txt

@@ -24,15 +24,16 @@ target_sources(
     PRIVATE
         ${CESIUM_ASYNC_SOURCES}
         ${CESIUM_ASYNC_HEADERS}
-    PUBLIC
         ${CESIUM_ASYNC_PUBLIC_HEADERS}
 )
 
 cesium_target_include_directories(
-    TARGET 
+    TARGET
         CesiumAsync
     PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/include
+        $<BUILD_INTERFACE:${CESIUM_NATIVE_RAPIDJSON_INCLUDE_DIR}>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+        $<INSTALL_INTERFACE:include>
     PRIVATE
         ${CMAKE_CURRENT_LIST_DIR}/src/
 )

CesiumGeometry/CMakeLists.txt

@@ -24,15 +24,15 @@ target_sources(
     PRIVATE
         ${CESIUM_GEOMETRY_SOURCES}
         ${CESIUM_GEOMETRY_HEADERS}
-    PUBLIC
         ${CESIUM_GEOMETRY_PUBLIC_HEADERS}
 )
 
 cesium_target_include_directories(
     TARGET
         CesiumGeometry
     PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/include
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+        $<INSTALL_INTERFACE:include>
 )
 
 target_link_libraries(CesiumGeometry PUBLIC

CesiumGeospatial/CMakeLists.txt

@@ -25,23 +25,23 @@ target_sources(
     PRIVATE
         ${CESIUM_GEOSPATIAL_SOURCES}
         ${CESIUM_GEOSPATIAL_HEADERS}
-    PUBLIC
         ${CESIUM_GEOSPATIAL_PUBLIC_HEADERS}
 )
 
 cesium_target_include_directories(
     TARGET
         CesiumGeospatial
     PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/include
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+        $<INSTALL_INTERFACE:include>
 )
 
 target_link_libraries(CesiumGeospatial
 PUBLIC
     CesiumGeometry
     CesiumUtility
-    earcut
 PRIVATE
+    $<BUILD_INTERFACE:earcut>
     s2::s2
 )
 

CesiumGltf/CMakeLists.txt

@@ -36,15 +36,15 @@ target_sources(
     PRIVATE
         ${CESIUM_GLTF_SOURCES}
         ${CESIUM_GLTF_HEADERS}
-    PUBLIC
         ${CESIUM_GLTF_PUBLIC_HEADERS}
 )
 
 target_include_directories(
     CesiumGltf
     SYSTEM PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/include/
-        ${CMAKE_CURRENT_LIST_DIR}/generated/include
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include/>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/generated/include>
+        $<INSTALL_INTERFACE:include>
     PRIVATE
         ${CMAKE_CURRENT_LIST_DIR}/src
         ${CMAKE_CURRENT_LIST_DIR}/generated/src

CesiumGltfContent/CMakeLists.txt

@@ -37,16 +37,16 @@ target_sources(
     PRIVATE
         ${CESIUM_GLTF_CONTENT_SOURCES}
         ${CESIUM_GLTF_CONTENT_HEADERS}
-    PUBLIC
         ${CESIUM_GLTF_CONTENT_PUBLIC_HEADERS}
 )
 
 cesium_target_include_directories(
     TARGET
         CesiumGltfContent
     PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/include
-        ${CMAKE_CURRENT_LIST_DIR}/generated/include
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/generated/include>
+        $<INSTALL_INTERFACE:include>
     PRIVATE
         ${CMAKE_CURRENT_LIST_DIR}/src
         ${CMAKE_CURRENT_LIST_DIR}/generated/src