diff options
| author | past-due <30942300+past-due@users.noreply.github.com> | 2018-03-19 19:41:20 -0400 |
|---|---|---|
| committer | past-due <30942300+past-due@users.noreply.github.com> | 2018-03-19 19:41:20 -0400 |
| commit | 2949174dad100476e68ec9b0d707509554a63f88 (patch) | |
| tree | 3018e5099ab149ba07672617a461265a26ba41e7 | |
| parent | 5968ebf9f4beae3a0662dfc6ba343b0be07a1241 (diff) | |
| download | vcpkg-2949174dad100476e68ec9b0d707509554a63f88.tar.gz vcpkg-2949174dad100476e68ec9b0d707509554a63f88.zip | |
[box2d] Fix build failure when VCPKG_BUILD_TYPE is set
| -rw-r--r-- | ports/box2d/portfile.cmake | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/ports/box2d/portfile.cmake b/ports/box2d/portfile.cmake index b07dbc663..87aaefc74 100644 --- a/ports/box2d/portfile.cmake +++ b/ports/box2d/portfile.cmake @@ -42,23 +42,27 @@ set(OUTPUTS_PATH "${SOURCE_PATH}/Box2D/Build/vs2015/bin/${PROJECT_ARCH_BITS}") vcpkg_build_msbuild(PROJECT_PATH ${SOURCE_PATH}/Box2D/Build/vs2015/Box2D.vcxproj) -message(STATUS "Packaging ${TARGET_TRIPLET}-Release lib") -file( - INSTALL ${OUTPUTS_PATH}/Release/ - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - FILES_MATCHING PATTERN "*.lib" -) -file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Box2D.lib ${CURRENT_PACKAGES_DIR}/lib/box2d.lib) -message(STATUS "Packaging ${TARGET_TRIPLET}-Release lib done") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + message(STATUS "Packaging ${TARGET_TRIPLET}-Release lib") + file( + INSTALL ${OUTPUTS_PATH}/Release/ + DESTINATION ${CURRENT_PACKAGES_DIR}/lib + FILES_MATCHING PATTERN "*.lib" + ) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Box2D.lib ${CURRENT_PACKAGES_DIR}/lib/box2d.lib) + message(STATUS "Packaging ${TARGET_TRIPLET}-Release lib done") +endif() -message(STATUS "Packaging ${TARGET_TRIPLET}-Debug lib") -file( - INSTALL ${OUTPUTS_PATH}/Debug/ - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib - FILES_MATCHING PATTERN "*.lib" -) -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Box2D.lib ${CURRENT_PACKAGES_DIR}/debug/lib/box2d.lib) -message(STATUS "Packaging ${TARGET_TRIPLET}-Debug lib done") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + message(STATUS "Packaging ${TARGET_TRIPLET}-Debug lib") + file( + INSTALL ${OUTPUTS_PATH}/Debug/ + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + FILES_MATCHING PATTERN "*.lib" + ) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Box2D.lib ${CURRENT_PACKAGES_DIR}/debug/lib/box2d.lib) + message(STATUS "Packaging ${TARGET_TRIPLET}-Debug lib done") +endif() message(STATUS "Packaging headers") file( |