mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 19:42:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[double-conversion] Fix on non-windows

Browse Source
This commit is contained in:
Robert Schumacher 2018-03-21 11:34:24 -07:00
parent d45954a96b
commit 38c9c97b6b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ports/double-conversion/portfile.cmake
View File

@ -23,6 +23,9 @@ vcpkg_configure_cmake(
vcpkg_install_cmake() vcpkg_install_cmake()
# Rename exported target files into something vcpkg_fixup_cmake_targets expects # Rename exported target files into something vcpkg_fixup_cmake_targets expects
if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/double-conversion)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/double-conversion)
endif()
if(NOT VCPKG_USE_HEAD_VERSION) if(NOT VCPKG_USE_HEAD_VERSION)
if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake)
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
@ -51,10 +54,6 @@ if(NOT VCPKG_USE_HEAD_VERSION)
vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
endif() endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
else()
if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/double-conversion)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/double-conversion)
endif()
endif() endif()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()

2
scripts/cmake/vcpkg_configure_cmake.cmake
View File

@ -180,6 +180,8 @@ function(vcpkg_configure_cmake)
"-DVCPKG_C_FLAGS_DEBUG=${VCPKG_C_FLAGS_DEBUG}" "-DVCPKG_C_FLAGS_DEBUG=${VCPKG_C_FLAGS_DEBUG}"
"-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}" "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}"
"-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}" "-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DCMAKE_INSTALL_BINDIR=bin"
) )
if(DEFINED ARCH) if(DEFINED ARCH)