Skip to content

Commit

Permalink
Merge pull request #962 from CesiumGS/install-debug-libs
Browse files Browse the repository at this point in the history
Install debug vcpkg libraries from `debug/lib`
  • Loading branch information
kring authored Nov 12, 2024
2 parents 544b2b3 + 2313ce0 commit 9f33f79
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
- Added support for `EXT_accessor_additional_types` in `AccessorView`.
- Added `EllipsoidTilesetLoader` that will generate a tileset by tesselating the surface of an ellipsoid, producing a simple globe tileset without any terrain features.

##### Fixes :wrench:

- Updated the CMake install process to install the vcpkg-built Debug binaries in Debug builds. Previously the Release binaries were installed instead.

### v0.41.0 - 2024-11-01

##### Breaking Changes :mega:
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ if(CESIUM_INSTALL_STATIC_LIBS OR CESIUM_INSTALL_HEADERS)

if (CESIUM_INSTALL_STATIC_LIBS AND NOT PACKAGE IN_LIST CESIUM_EXCLUDE_INSTALL_STATIC_LIBS AND EXISTS ${PACKAGE_DIR}/lib)
install(
DIRECTORY ${PACKAGE_DIR}/lib/
DIRECTORY $<IF:$<CONFIG:Debug>,${PACKAGE_DIR}/debug/lib/,${PACKAGE_DIR}/lib/>
DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
endif()
Expand All @@ -134,7 +134,7 @@ if(CESIUM_INSTALL_STATIC_LIBS)
message(DEBUG "PACKAGE_DIR ${PACKAGE_DIR}")
if (NOT PACKAGE IN_LIST CESIUM_EXCLUDE_INSTALL_STATIC_LIBS AND EXISTS ${PACKAGE_DIR}/lib)
install(
DIRECTORY ${PACKAGE_DIR}/lib/
DIRECTORY $<IF:$<CONFIG:Debug>,${PACKAGE_DIR}/debug/lib/,${PACKAGE_DIR}/lib/>
DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
endif()
Expand Down

0 comments on commit 9f33f79

Please sign in to comment.