Merge pull request #1166 from CesiumGS/optional-exports

Don't install exports unless libs and headers are also installed.

Author: kring

CHANGES.md

@@ -4,6 +4,7 @@
 
 ##### Breaking Changes :mega:
 
+- Deprecated the `ViewState::create` methods. Use a constructor overload instead.
 - Removed `addCreditToFrame`, `startNextFrame`, `getCreditsToShowThisFrame`, and `getCreditsToNoLongerShowThisFrame` from `CreditSystem`. `CreditSystem` no longer has a notion of a "frame". Instead, credits are included and excluded by calling `addCreditReference` and `removeCreditReference`. A snaphot of the current state can be obtained by calling `getSnapshot`, and it includes both the current set of active credits as well as the credits that were removed since the last snapshot.
 - Removed the following from `Cesium3DTilesSelection::Tile`:
   - `getLastSelectionState` and `setLastSelectionState`. Use `TilesetViewGroup::getTraversalState` instead.

CMakeLists.txt

@@ -345,18 +345,20 @@ 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)
+if(CESIUM_INSTALL_STATIC_LIBS AND CESIUM_INSTALL_HEADERS)
+  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)
+endif()

cmake/macros/configure_cesium_library.cmake

@@ -54,10 +54,12 @@ function(configure_cesium_library targetName)
                 ${capitalizedTargetName}_BUILDING
         )
 
-        install(TARGETS ${targetName}
-            EXPORT CesiumExports
-            INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-        )
+        if(CESIUM_INSTALL_STATIC_LIBS AND CESIUM_INSTALL_HEADERS)
+          install(TARGETS ${targetName}
+              EXPORT CesiumExports
+              INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+          )
+        endif()
 
         if(CESIUM_INSTALL_HEADERS)
             install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include