mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-25 07:29:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
7f3e185316
vcpkg/ports/arrow/all.patch
Robert Schumacher 9d473a6954
[boost] Update to 1.70.0 (#6141) 
* [boost] Update to 1.70.0

* [boost-build] Update to 1.70.0

* [folly][freeopcua][libtorrent][websocketpp] Upgrades/patches to handle boost 1.70

* [boost-variant] Revert to 1.69 due to regression
[fizz][folly] Update and fix for boost 1.70
[libsodium] Use CMake buildsystem replacement to enable non-Windows

* [wangle] Update. [folly] Avoid linking debug libs in release.

* [pcl] Fix compatibility with boost 1.70

* [fizz] Handle merge regression

* [arrow] Modernize and fix cmake targets

* [boost-type-traits] Update patches for arm64-windows

* [boost-locale] Add boost-system and boost-thread as arm64 dependencies

* [ompl] Add missing boost-timer dependency
2019-05-16 18:33:32 -07:00

298 lines
13 KiB
Diff
Raw Blame History

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 52081c4..e1e13b5 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -804,6 +804,9 @@ if(ARROW_USE_GLOG)
list(APPEND ARROW_LINK_LIBS GLOG::glog)
list(APPEND ARROW_STATIC_LINK_LIBS GLOG::glog)
list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS GLOG::glog)
+ if(ARROW_NEED_GFLAGS)
+ list(APPEND ARROW_STATIC_LINK_LIBS gflags::gflags)
+ endif()
add_definitions("-DARROW_USE_GLOG")
endif()
diff --git a/cpp/cmake_modules/FindBrotli.cmake b/cpp/cmake_modules/FindBrotli.cmake
index e1429a2..6dee036 100644
--- a/cpp/cmake_modules/FindBrotli.cmake
+++ b/cpp/cmake_modules/FindBrotli.cmake
@@ -18,6 +18,7 @@
# find_package(Brotli)
pkg_check_modules(BROTLI_PC libbrotlicommon libbrotlienc libbrotlidec)
+
if(BROTLI_PC_FOUND)
set(BROTLI_INCLUDE_DIR "${BROTLI_PC_libbrotlicommon_INCLUDEDIR}")
@@ -25,80 +26,16 @@ if(BROTLI_PC_FOUND)
list(APPEND BROTLI_PC_LIBRARY_DIRS "${BROTLI_PC_libbrotlicommon_LIBDIR}")
list(APPEND BROTLI_PC_LIBRARY_DIRS "${BROTLI_PC_libbrotlienc_LIBDIR}")
list(APPEND BROTLI_PC_LIBRARY_DIRS "${BROTLI_PC_libbrotlidec_LIBDIR}")
-
- find_library(BROTLI_COMMON_LIBRARY brotlicommon
- PATHS ${BROTLI_PC_LIBRARY_DIRS}
- NO_DEFAULT_PATH)
- find_library(BROTLI_ENC_LIBRARY brotlienc
- PATHS ${BROTLI_PC_LIBRARY_DIRS}
- NO_DEFAULT_PATH)
- find_library(BROTLI_DEC_LIBRARY brotlidec
- PATHS ${BROTLI_PC_LIBRARY_DIRS}
- NO_DEFAULT_PATH)
elseif(BROTLI_ROOT)
- find_library(
- BROTLI_COMMON_LIBRARY
- NAMES brotlicommon
- ${CMAKE_SHARED_LIBRARY_PREFIX}brotlicommon${CMAKE_SHARED_LIBRARY_SUFFIX}
- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon${CMAKE_STATIC_LIBRARY_SUFFIX}
- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon-static${CMAKE_STATIC_LIBRARY_SUFFIX}
- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon_static${CMAKE_STATIC_LIBRARY_SUFFIX}
- PATHS ${BROTLI_ROOT} "${BROTLI_ROOT}/Library"
- PATH_SUFFIXES "lib64" "lib" "bin"
- NO_DEFAULT_PATH)
- find_library(
- BROTLI_ENC_LIBRARY
- NAMES brotlienc
- ${CMAKE_SHARED_LIBRARY_PREFIX}brotlienc${CMAKE_SHARED_LIBRARY_SUFFIX}
- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc${CMAKE_STATIC_LIBRARY_SUFFIX}
- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc-static${CMAKE_STATIC_LIBRARY_SUFFIX}
- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc_static${CMAKE_STATIC_LIBRARY_SUFFIX}
- PATHS ${BROTLI_ROOT} "${BROTLI_ROOT}/Library"
- PATH_SUFFIXES "lib64" "lib" "bin"
- NO_DEFAULT_PATH)
- find_library(
- BROTLI_DEC_LIBRARY
- NAMES brotlidec
- ${CMAKE_SHARED_LIBRARY_PREFIX}brotlidec${CMAKE_SHARED_LIBRARY_SUFFIX}
- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec${CMAKE_STATIC_LIBRARY_SUFFIX}
- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec-static${CMAKE_STATIC_LIBRARY_SUFFIX}
- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec_static${CMAKE_STATIC_LIBRARY_SUFFIX}
- PATHS ${BROTLI_ROOT} "${BROTLI_ROOT}/Library"
- PATH_SUFFIXES "lib64" "lib" "bin"
- NO_DEFAULT_PATH)
- find_path(BROTLI_INCLUDE_DIR
- NAMES brotli/decode.h
- PATHS ${BROTLI_ROOT} "${BROTLI_ROOT}/Library"
- NO_DEFAULT_PATH
- PATH_SUFFIXES "include")
+ find_path(BROTLI_INCLUDE_DIR NAMES brotli/decode.h PATH_SUFFIXES "include")
else()
- find_library(
- BROTLI_COMMON_LIBRARY
- NAMES brotlicommon
- ${CMAKE_SHARED_LIBRARY_PREFIX}brotlicommon${CMAKE_SHARED_LIBRARY_SUFFIX}
- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon${CMAKE_STATIC_LIBRARY_SUFFIX}
- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon-static${CMAKE_STATIC_LIBRARY_SUFFIX}
- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon_static${CMAKE_STATIC_LIBRARY_SUFFIX}
- PATH_SUFFIXES "lib64" "lib" "bin")
- find_library(
- BROTLI_ENC_LIBRARY
- NAMES brotlienc
- ${CMAKE_SHARED_LIBRARY_PREFIX}brotlienc${CMAKE_SHARED_LIBRARY_SUFFIX}
- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc${CMAKE_STATIC_LIBRARY_SUFFIX}
- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc-static${CMAKE_STATIC_LIBRARY_SUFFIX}
- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc_static${CMAKE_STATIC_LIBRARY_SUFFIX}
- PATH_SUFFIXES "lib64" "lib" "bin")
- find_library(
- BROTLI_DEC_LIBRARY
- NAMES brotlidec
- ${CMAKE_SHARED_LIBRARY_PREFIX}brotlidec${CMAKE_SHARED_LIBRARY_SUFFIX}
- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec${CMAKE_STATIC_LIBRARY_SUFFIX}
- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec-static${CMAKE_STATIC_LIBRARY_SUFFIX}
- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec_static${CMAKE_STATIC_LIBRARY_SUFFIX}
- PATH_SUFFIXES "lib64" "lib" "bin")
find_path(BROTLI_INCLUDE_DIR NAMES brotli/decode.h PATH_SUFFIXES "include")
endif()
+find_library(BROTLI_COMMON_LIBRARY NAMES brotlicommon brotlicommon-static libbrotlicommon libbrotlicommon-static)
+find_library(BROTLI_ENC_LIBRARY NAMES libbrotlienc libbrotlienc-static brotlienc brotlienc-static)
+find_library(BROTLI_DEC_LIBRARY NAMES brotlidec libbrotlidec libbrotlidec-static brotlidec brotlidec-static)
+
find_package_handle_standard_args(Brotli
REQUIRED_VARS
BROTLI_COMMON_LIBRARY
diff --git a/cpp/cmake_modules/FindLz4.cmake b/cpp/cmake_modules/FindLz4.cmake
index 3606f5c..1d18b7c 100644
--- a/cpp/cmake_modules/FindLz4.cmake
+++ b/cpp/cmake_modules/FindLz4.cmake
@@ -19,24 +19,26 @@ if(MSVC AND NOT DEFINED LZ4_MSVC_STATIC_LIB_SUFFIX)
set(LZ4_MSVC_STATIC_LIB_SUFFIX "_static")
endif()
-set(LZ4_STATIC_LIB_SUFFIX "${LZ4_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+ set(LZ4_LIB_NAME_DEBUG_SUFFIX d)
+endif()
-set(LZ4_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}lz4${LZ4_STATIC_LIB_SUFFIX})
+set(LZ4_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}lz4${LZ4_MSVC_STATIC_LIB_SUFFIX}${LZ4_LIB_NAME_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
pkg_check_modules(LZ4_PC liblz4)
if(LZ4_PC_FOUND)
set(LZ4_INCLUDE_DIR "${LZ4_PC_INCLUDEDIR}")
list(APPEND LZ4_PC_LIBRARY_DIRS "${LZ4_PC_LIBDIR}")
- find_library(LZ4_LIB lz4
+ find_library(LZ4_LIB lz4${LZ4_LIB_NAME_DEBUG_SUFFIX}
PATHS ${LZ4_PC_LIBRARY_DIRS}
NO_DEFAULT_PATH
PATH_SUFFIXES "${CMAKE_LIBRARY_ARCHITECTURE}")
elseif(LZ4_ROOT)
find_library(
LZ4_LIB
- NAMES lz4 ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
- "${CMAKE_SHARED_LIBRARY_PREFIX}lz4_static${CMAKE_SHARED_LIBRARY_SUFFIX}"
+ NAMES lz4${LZ4_LIB_NAME_DEBUG_SUFFIX} ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
+ "${CMAKE_SHARED_LIBRARY_PREFIX}lz4_static${CMAKE_SHARED_LIBRARY_SUFFIX}${LZ4_LIB_NAME_DEBUG_SUFFIX}"
PATHS ${LZ4_ROOT} "${LZ4_ROOT}/Library"
PATH_SUFFIXES "lib64" "lib" "bin"
NO_DEFAULT_PATH)
@@ -48,8 +50,8 @@ elseif(LZ4_ROOT)
else()
find_library(
LZ4_LIB
- NAMES lz4 ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
- "${CMAKE_SHARED_LIBRARY_PREFIX}lz4_static${CMAKE_SHARED_LIBRARY_SUFFIX}"
+ NAMES lz4${LZ4_LIB_NAME_DEBUG_SUFFIX} ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
+ "${CMAKE_SHARED_LIBRARY_PREFIX}lz4_static${CMAKE_SHARED_LIBRARY_SUFFIX}${LZ4_LIB_NAME_DEBUG_SUFFIX}"
PATH_SUFFIXES "lib64" "lib" "bin")
find_path(LZ4_INCLUDE_DIR NAMES lz4.h PATH_SUFFIXES "include")
endif()
diff --git a/cpp/cmake_modules/FindThrift.cmake b/cpp/cmake_modules/FindThrift.cmake
index a4decf7..78ec7c8 100644
--- a/cpp/cmake_modules/FindThrift.cmake
+++ b/cpp/cmake_modules/FindThrift.cmake
@@ -65,6 +65,10 @@ if(MSVC AND NOT THRIFT_MSVC_STATIC_LIB_SUFFIX)
set(THRIFT_MSVC_STATIC_LIB_SUFFIX md)
endif()
+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+ set(THRIFT_LIB_NAME_DEBUG_SUFFIX d)
+endif()
+
pkg_check_modules(THRIFT_PC thrift)
# THRIFT-4760: The pkgconfig files are currently only installed when using autotools.
@@ -74,15 +78,13 @@ if(THRIFT_PC_FOUND)
list(APPEND THRIFT_PC_LIBRARY_DIRS "${THRIFT_PC_LIBDIR}")
- find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}
- PATHS ${THRIFT_PC_LIBRARY_DIRS}
- NO_DEFAULT_PATH)
+ find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}${THRIFT_LIB_NAME_DEBUG_SUFFIX}
+ PATHS ${THRIFT_PC_LIBRARY_DIRS})
find_program(THRIFT_COMPILER thrift
HINTS ${THRIFT_PC_PREFIX}
- NO_DEFAULT_PATH
PATH_SUFFIXES "bin")
else()
- find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}
+ find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}${THRIFT_LIB_NAME_DEBUG_SUFFIX}
HINTS ${Thrift_ROOT}
PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib")
find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h
diff --git a/cpp/cmake_modules/FindZSTD.cmake b/cpp/cmake_modules/FindZSTD.cmake
index 17b58a3..fa2ab05 100644
--- a/cpp/cmake_modules/FindZSTD.cmake
+++ b/cpp/cmake_modules/FindZSTD.cmake
@@ -19,7 +19,11 @@ if(MSVC AND NOT DEFINED ZSTD_MSVC_STATIC_LIB_SUFFIX)
set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static")
endif()
-set(ZSTD_STATIC_LIB_SUFFIX "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+ set(ZSTD_LIB_NAME_DEBUG_SUFFIX d)
+endif()
+
+set(ZSTD_STATIC_LIB_SUFFIX "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
set(ZSTD_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}zstd${ZSTD_STATIC_LIB_SUFFIX})
pkg_check_modules(ZSTD_PC libzstd)
@@ -27,18 +31,15 @@ if(ZSTD_PC_FOUND)
set(ZSTD_INCLUDE_DIR "${ZSTD_PC_INCLUDEDIR}")
list(APPEND ZSTD_PC_LIBRARY_DIRS "${ZSTD_PC_LIBDIR}")
- find_library(ZSTD_LIB zstd
+ find_library(ZSTD_LIB zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}
PATHS ${ZSTD_PC_LIBRARY_DIRS}
NO_DEFAULT_PATH
PATH_SUFFIXES "${CMAKE_LIBRARY_ARCHITECTURE}")
elseif(ZSTD_ROOT)
message(STATUS "Using ZSTD_ROOT: ${ZSTD_ROOT}")
find_library(ZSTD_LIB
- NAMES zstd "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
- "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${CMAKE_SHARED_LIBRARY_SUFFIX}"
- PATHS ${ZSTD_ROOT} "${ZSTD_ROOT}/Library"
- PATH_SUFFIXES "lib64" "lib" "bin"
- NO_DEFAULT_PATH)
+ NAMES zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX} "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
+ "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
find_path(ZSTD_INCLUDE_DIR
NAMES zstd.h
PATHS ${ZSTD_ROOT} "${ZSTD_ROOT}/Library"
@@ -46,9 +47,8 @@ elseif(ZSTD_ROOT)
PATH_SUFFIXES "include")
else()
find_library(ZSTD_LIB
- NAMES zstd "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
- "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${CMAKE_SHARED_LIBRARY_SUFFIX}"
- PATH_SUFFIXES "lib64" "lib" "bin")
+ NAMES zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX} "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
+ "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
find_path(ZSTD_INCLUDE_DIR NAMES zstd.h PATH_SUFFIXES "include")
endif()
diff --git a/cpp/cmake_modules/FindgflagsAlt.cmake b/cpp/cmake_modules/FindgflagsAlt.cmake
index a9b8684..fdb815a 100644
--- a/cpp/cmake_modules/FindgflagsAlt.cmake
+++ b/cpp/cmake_modules/FindgflagsAlt.cmake
@@ -15,18 +15,13 @@
# specific language governing permissions and limitations
# under the License.
-if(gflags_ROOT)
- find_library(gflags_LIB NAMES gflags PATHS ${gflags_ROOT} NO_DEFAULT_PATH)
- find_path(GFLAGS_INCLUDE_DIR
- NAMES gflags/gflags.h
- PATHS ${gflags_ROOT}
- NO_DEFAULT_PATH
- PATH_SUFFIXES "include")
-else()
- find_library(gflags_LIB NAMES gflags)
- find_path(GFLAGS_INCLUDE_DIR NAMES gflags/gflags.h PATH_SUFFIXES "include")
+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+ set(GFLAGS_LIB_NAME_DEBUG_SUFFIX _debug)
endif()
+find_library(gflags_LIB NAMES gflags${GFLAGS_LIB_NAME_DEBUG_SUFFIX} gflags_static${GFLAGS_LIB_NAME_DEBUG_SUFFIX})
+find_path(GFLAGS_INCLUDE_DIR NAMES gflags/gflags.h PATH_SUFFIXES "include")
+
find_package_handle_standard_args(gflagsAlt REQUIRED_VARS gflags_LIB GFLAGS_INCLUDE_DIR)
if(gflagsAlt_FOUND)
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index bdb122b..58c123e 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -923,10 +923,7 @@ if(ARROW_NEED_GFLAGS)
elseif(gflags_SOURCE STREQUAL "SYSTEM")
# gflagsConfig.cmake is not installed on Ubuntu/Debian
# TODO: Make a bug report upstream
- find_package(gflags)
- if(NOT gflags_FOUND)
- find_package(gflagsAlt REQUIRED)
- endif()
+ find_package(gflagsAlt REQUIRED)
endif()
# TODO: Don't use global includes but rather target_include_directories
include_directories(SYSTEM ${GFLAGS_INCLUDE_DIR})
@@ -1558,7 +1555,7 @@ if(ARROW_WITH_FLATBUFFERS)
elseif(Flatbuffers_SOURCE STREQUAL "BUNDLED")
build_flatbuffers()
elseif(Flatbuffers_SOURCE STREQUAL "SYSTEM")
- find_package(Flatbuffers QUIET)
+ #find_package(Flatbuffers QUIET) - disabled because on vcpkg this looks in the wrong place for the fb compiler and causes an error
if(NOT Flatbuffers_FOUND)
find_package(FlatbuffersAlt REQUIRED)
endif()
Reference in New Issue View Git Blame Copy Permalink