aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alex@karatarakis.com>2018-03-20 01:46:27 -0700
committerGitHub <noreply@github.com>2018-03-20 01:46:27 -0700
commit1ef3d4b294e9e97a10d3583634650fac6c551bac (patch)
treef5dcd87c4f2b916fa00f025fd0cfde8dcd19f112
parentdb4cd678817b767fa0a9c9e1494eb0390da8066f (diff)
parent9d02fb0dc8c051e0ecaa188a29d9b0616477c0ae (diff)
downloadvcpkg-1ef3d4b294e9e97a10d3583634650fac6c551bac.tar.gz
vcpkg-1ef3d4b294e9e97a10d3583634650fac6c551bac.zip
Merge pull request #3087 from past-due/double-conversion_fix_vcpkg_build_type
[double-conversion] Fix build failure when VCPKG_BUILD_TYPE is set
-rw-r--r--ports/double-conversion/portfile.cmake12
1 files changed, 8 insertions, 4 deletions
diff --git a/ports/double-conversion/portfile.cmake b/ports/double-conversion/portfile.cmake
index 8fc31c692..326d7e1c1 100644
--- a/ports/double-conversion/portfile.cmake
+++ b/ports/double-conversion/portfile.cmake
@@ -25,10 +25,14 @@ vcpkg_install_cmake()
# Rename exported target files into something vcpkg_fixup_cmake_targets expects
if(NOT VCPKG_USE_HEAD_VERSION)
if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake)
- file(RENAME ${CURRENT_PACKAGES_DIR}/debug/CMake/double-conversionLibraryDepends-debug.cmake
- ${CURRENT_PACKAGES_DIR}/debug/CMake/double-conversionTargets-debug.cmake)
- file(RENAME ${CURRENT_PACKAGES_DIR}/CMake/double-conversionLibraryDepends-release.cmake
- ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets-release.cmake)
+ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+ file(RENAME ${CURRENT_PACKAGES_DIR}/debug/CMake/double-conversionLibraryDepends-debug.cmake
+ ${CURRENT_PACKAGES_DIR}/debug/CMake/double-conversionTargets-debug.cmake)
+ endif()
+ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+ file(RENAME ${CURRENT_PACKAGES_DIR}/CMake/double-conversionLibraryDepends-release.cmake
+ ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets-release.cmake)
+ endif()
file(RENAME ${CURRENT_PACKAGES_DIR}/CMake/double-conversionLibraryDepends.cmake
${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake)