[double-conversion] Bump version, build arm static to avoid cmake bug

This commit is contained in:
Robert Schumacher 2017-05-28 05:28:34 -07:00
parent c5d7766b00
commit b566676eff
2 changed files with 26 additions and 19 deletions

View File

@ -1,3 +1,3 @@
Source: double-conversion Source: double-conversion
Version: 2.0.1 Version: 2.0.1-1
Description: Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles. Description: Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles.

View File

@ -6,41 +6,48 @@
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
# #
# Common Ambient Variables: if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg> # This is due to a bug in CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS on arm
# TARGET_TRIPLET is the current triplet (x86-windows, etc) message(STATUS "DLLs on arm aren't currently supported. Building static libs instead.")
# PORT is the current port name (zlib, etc) set(VCPKG_LIBRARY_LINKAGE "static")
# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} endif()
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
#
include(vcpkg_common_functions) include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/double-conversion-d4d68e4e788bec89d55a6a3e33af674087837c82)
vcpkg_download_distfile(ARCHIVE vcpkg_from_github(
URLS "https://github.com/google/double-conversion/archive/d4d68e4e788bec89d55a6a3e33af674087837c82.zip" OUT_SOURCE_PATH SOURCE_PATH
FILENAME "d4d68e4e788bec89d55a6a3e33af674087837c82.zip" REPO google/double-conversion
SHA512 1406dc22b4ea71e1a2490f96cfed3230e122b97607c83ba106df4e90c7e4bfdcfc136c88741e7f1127237b38b4944d462ec5a4627a71f5ea3fe14afbcc64cd44 REF d4d68e4e788bec89d55a6a3e33af674087837c82
SHA512 200b2f5ff1dfe4591f3c168e465ed154993469b7adf22b5bb2ae707d60d360ac45b51385f2d09d2a8358a914db01a790050cd9d9b78645f5ea5159410ce1de17
HEAD_REF master
) )
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches( vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/001-fix-arm.patch PATCHES ${CMAKE_CURRENT_LIST_DIR}/001-fix-arm.patch
) )
vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} set(OPTIONS)
OPTIONS -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=True) if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
set(OPTIONS -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=True)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
${OPTIONS}
)
vcpkg_install_cmake() vcpkg_install_cmake()
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
file(RENAME ${CURRENT_PACKAGES_DIR}/CMake ${CURRENT_PACKAGES_DIR}/share/double-conversion) file(RENAME ${CURRENT_PACKAGES_DIR}/CMake ${CURRENT_PACKAGES_DIR}/share/double-conversion)
file(READ ${CURRENT_PACKAGES_DIR}/debug/CMake/double-conversionLibraryDepends-debug.cmake DEBUG_MODULE) file(READ ${CURRENT_PACKAGES_DIR}/debug/CMake/double-conversionLibraryDepends-debug.cmake DEBUG_MODULE)
string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" DEBUG_MODULE "${DEBUG_MODULE}") string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" DEBUG_MODULE "${DEBUG_MODULE}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/double-conversion/double-conversionLibraryDepends-debug.cmake "${DEBUG_MODULE}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/double-conversion/double-conversionLibraryDepends-debug.cmake "${DEBUG_MODULE}")
#file(COPY ${SOURCE_PATH}/double-conversion DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/CMake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/CMake)
vcpkg_copy_pdbs()
message(STATUS "Installing done") vcpkg_copy_pdbs()
# Include files should not be duplicated into the /debug/include directory. # Include files should not be duplicated into the /debug/include directory.
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)