diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-03-20 01:22:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-20 01:22:02 -0700 |
| commit | 2b4b3d4c4d4f8a6e9286b414c388942fe07f5353 (patch) | |
| tree | 0ae66137ad8c8924975fc2402e27b50e7c30026a | |
| parent | 60572a997b5e61fdfa96d48dc54f9e19b894e942 (diff) | |
| parent | 57c3b6acb3681cffb8df9adf0e8899e9c88764fd (diff) | |
| download | vcpkg-2b4b3d4c4d4f8a6e9286b414c388942fe07f5353.tar.gz vcpkg-2b4b3d4c4d4f8a6e9286b414c388942fe07f5353.zip | |
Merge pull request #3079 from past-due/yoga_fix_vcpkg_build_type
[yoga] Fix build failure when VCPKG_BUILD_TYPE is set
| -rw-r--r-- | ports/yoga/portfile.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ports/yoga/portfile.cmake b/ports/yoga/portfile.cmake index ba13192c8..e6dc1c709 100644 --- a/ports/yoga/portfile.cmake +++ b/ports/yoga/portfile.cmake @@ -33,8 +33,12 @@ vcpkg_build_cmake() vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/yoga DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.h") -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/yogacore.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/yogacore.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/yogacore.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/yogacore.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +endif() vcpkg_copy_pdbs() |
