aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-10-31 02:14:39 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-10-31 02:14:39 -0700
commit912c38d466a7edf5a9d8727e3f6143f294e2f9fc (patch)
treeecb337a6bc6198e97e6b0420b95271f7c385b9d7
parent33fc44a0e3ade2c7e9369723b2ee4965ee8795e6 (diff)
downloadvcpkg-912c38d466a7edf5a9d8727e3f6143f294e2f9fc.tar.gz
vcpkg-912c38d466a7edf5a9d8727e3f6143f294e2f9fc.zip
[double-conversion] Fix --head builds
-rw-r--r--ports/double-conversion/portfile.cmake46
1 files changed, 24 insertions, 22 deletions
diff --git a/ports/double-conversion/portfile.cmake b/ports/double-conversion/portfile.cmake
index 7bf2f6a63..cbb67bfb6 100644
--- a/ports/double-conversion/portfile.cmake
+++ b/ports/double-conversion/portfile.cmake
@@ -23,28 +23,30 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
# Rename exported target files into something vcpkg_fixup_cmake_targets expects
-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)
-file(RENAME ${CURRENT_PACKAGES_DIR}/CMake/double-conversionLibraryDepends.cmake
- ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake)
-
-file(READ ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake TARGETS_FILE)
-string(REPLACE "double-conversionLibraryDepends" "double-conversionTargets" TARGETS_FILE "${TARGETS_FILE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake "${TARGETS_FILE}")
-
-# Remove hardcoded paths from config file
-file(READ ${CURRENT_PACKAGES_DIR}/CMake/double-conversionConfig.cmake CONFIG_FILE)
-string(REPLACE "${CURRENT_PACKAGES_DIR}/lib/cmake/double-conversion/double-conversionLibraryDepends.cmake"
- "\${double-conversion_CMAKE_DIR}/double-conversionTargets.cmake" CONFIG_FILE "${CONFIG_FILE}")
-string(REPLACE "${CURRENT_PACKAGES_DIR}"
- "\${double-conversion_CMAKE_DIR}/../.." CONFIG_FILE "${CONFIG_FILE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/CMake/double-conversionConfig.cmake "${CONFIG_FILE}")
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+if(NOT VCPKG_USE_HEAD_VERSION)
+ 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)
+ file(RENAME ${CURRENT_PACKAGES_DIR}/CMake/double-conversionLibraryDepends.cmake
+ ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake)
+
+ file(READ ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake TARGETS_FILE)
+ string(REPLACE "double-conversionLibraryDepends" "double-conversionTargets" TARGETS_FILE "${TARGETS_FILE}")
+ file(WRITE ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake "${TARGETS_FILE}")
+
+ # Remove hardcoded paths from config file
+ file(READ ${CURRENT_PACKAGES_DIR}/CMake/double-conversionConfig.cmake CONFIG_FILE)
+ string(REPLACE "${CURRENT_PACKAGES_DIR}/lib/cmake/double-conversion/double-conversionLibraryDepends.cmake"
+ "\${double-conversion_CMAKE_DIR}/double-conversionTargets.cmake" CONFIG_FILE "${CONFIG_FILE}")
+ string(REPLACE "${CURRENT_PACKAGES_DIR}"
+ "\${double-conversion_CMAKE_DIR}/../.." CONFIG_FILE "${CONFIG_FILE}")
+ file(WRITE ${CURRENT_PACKAGES_DIR}/CMake/double-conversionConfig.cmake "${CONFIG_FILE}")
+
+ vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
+else()
+ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/double-conversion)
+endif()
vcpkg_copy_pdbs()