mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-21 12:05:35 +08:00
131 lines
6.4 KiB
Diff
131 lines
6.4 KiB
Diff
|
diff --git a/cmake_modules/FindBrotli.cmake b/cmake_modules/FindBrotli.cmake
|
||
|
index f2e714c..2e475dc 100644
|
||
|
--- a/cmake_modules/FindBrotli.cmake
|
||
|
+++ b/cmake_modules/FindBrotli.cmake
|
||
|
@@ -65,16 +65,13 @@ if (BROTLI_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR BROTLI_LIBRARIES))
|
||
|
set(BROTLI_FOUND TRUE)
|
||
|
get_filename_component( BROTLI_LIBS ${BROTLI_LIBRARY_ENC} PATH )
|
||
|
set(BROTLI_LIB_NAME brotli)
|
||
|
- if (MSVC AND NOT BROTLI_MSVC_STATIC_LIB_SUFFIX)
|
||
|
- set(BROTLI_MSVC_STATIC_LIB_SUFFIX _static)
|
||
|
- endif()
|
||
|
set(BROTLI_STATIC_LIB
|
||
|
- ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||
|
- ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||
|
- ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||
|
- set(BROTLI_STATIC_LIBRARY_ENC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||
|
- set(BROTLI_STATIC_LIBRARY_DEC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||
|
- set(BROTLI_STATIC_LIBRARY_COMMON ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||
|
+ ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||
|
+ ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||
|
+ ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||
|
+ set(BROTLI_STATIC_LIBRARY_ENC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||
|
+ set(BROTLI_STATIC_LIBRARY_DEC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||
|
+ set(BROTLI_STATIC_LIBRARY_COMMON ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||
|
set(BROTLI_SHARED_LIB
|
||
|
${BROTLI_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||
|
${BROTLI_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||
|
diff --git a/cmake_modules/FindFlatbuffers.cmake b/cmake_modules/FindFlatbuffers.cmake
|
||
|
index 804f479..ff9bde1 100644
|
||
|
--- a/cmake_modules/FindFlatbuffers.cmake
|
||
|
+++ b/cmake_modules/FindFlatbuffers.cmake
|
||
|
@@ -53,6 +53,7 @@ endif ()
|
||
|
|
||
|
find_program(FLATBUFFERS_COMPILER flatc
|
||
|
"${FLATBUFFERS_HOME}/bin"
|
||
|
+ "${FLATBUFFERS_HOME}/tools"
|
||
|
/usr/local/bin
|
||
|
/usr/bin
|
||
|
NO_DEFAULT_PATH
|
||
|
diff --git a/cmake_modules/FindLz4.cmake b/cmake_modules/FindLz4.cmake
|
||
|
index 07707cf..9cbf67d 100644
|
||
|
--- a/cmake_modules/FindLz4.cmake
|
||
|
+++ b/cmake_modules/FindLz4.cmake
|
||
|
@@ -29,15 +29,7 @@ elseif ( Lz4_HOME )
|
||
|
list( APPEND _lz4_roots ${Lz4_HOME} )
|
||
|
endif()
|
||
|
|
||
|
-if (MSVC AND NOT 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}")
|
||
|
-
|
||
|
-set(LZ4_STATIC_LIB_NAME
|
||
|
- ${CMAKE_STATIC_LIBRARY_PREFIX}lz4${LZ4_STATIC_LIB_SUFFIX})
|
||
|
+set(LZ4_STATIC_LIB_NAME lz4)
|
||
|
|
||
|
find_path(LZ4_INCLUDE_DIR NAMES lz4.h
|
||
|
PATHS ${_lz4_roots}
|
||
|
diff --git a/cmake_modules/FindSnappy.cmake b/cmake_modules/FindSnappy.cmake
|
||
|
index 867963c..8a432db 100644
|
||
|
--- a/cmake_modules/FindSnappy.cmake
|
||
|
+++ b/cmake_modules/FindSnappy.cmake
|
||
|
@@ -55,7 +55,7 @@ if (SNAPPY_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR SNAPPY_LIBRARIES))
|
||
|
set(SNAPPY_HEADER_NAME snappy.h)
|
||
|
set(SNAPPY_HEADER ${SNAPPY_INCLUDE_DIR}/${SNAPPY_HEADER_NAME})
|
||
|
set(SNAPPY_LIB_NAME snappy)
|
||
|
- set(SNAPPY_STATIC_LIB ${SNAPPY_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${SNAPPY_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||
|
+ set(SNAPPY_STATIC_LIB ${SNAPPY_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||
|
set(SNAPPY_SHARED_LIB ${SNAPPY_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
|
||
|
else ()
|
||
|
set(SNAPPY_FOUND FALSE)
|
||
|
diff --git a/cmake_modules/FindZLIB.cmake b/cmake_modules/FindZLIB.cmake
|
||
|
index 78b84f2..eb09001 100644
|
||
|
--- a/cmake_modules/FindZLIB.cmake
|
||
|
+++ b/cmake_modules/FindZLIB.cmake
|
||
|
@@ -62,11 +62,11 @@ if (ZLIB_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR ZLIB_LIBRARIES))
|
||
|
set(ZLIB_LIB_NAME z)
|
||
|
if (MSVC)
|
||
|
if (NOT ZLIB_MSVC_STATIC_LIB_SUFFIX)
|
||
|
- set(ZLIB_MSVC_STATIC_LIB_SUFFIX libstatic)
|
||
|
+ set(ZLIB_MSVC_STATIC_LIB_SUFFIX lib)
|
||
|
endif()
|
||
|
set(ZLIB_MSVC_SHARED_LIB_SUFFIX lib)
|
||
|
endif()
|
||
|
- set(ZLIB_STATIC_LIB ${ZLIB_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${ZLIB_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||
|
+ set(ZLIB_STATIC_LIB ${ZLIB_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${ZLIB_MSVC_SHARED_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||
|
set(ZLIB_SHARED_LIB ${ZLIB_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${ZLIB_MSVC_SHARED_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
|
||
|
else ()
|
||
|
set(ZLIB_FOUND FALSE)
|
||
|
diff --git a/cmake_modules/FindZSTD.cmake b/cmake_modules/FindZSTD.cmake
|
||
|
index 02a0c39..73c61b5 100644
|
||
|
--- a/cmake_modules/FindZSTD.cmake
|
||
|
+++ b/cmake_modules/FindZSTD.cmake
|
||
|
@@ -29,21 +29,11 @@ elseif ( ZStd_HOME )
|
||
|
list( APPEND _zstd_roots ${ZStd_HOME} )
|
||
|
endif()
|
||
|
|
||
|
-if (MSVC AND NOT 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}")
|
||
|
-
|
||
|
-set(ZSTD_STATIC_LIB_NAME
|
||
|
- ${CMAKE_STATIC_LIBRARY_PREFIX}zstd${ZSTD_STATIC_LIB_SUFFIX})
|
||
|
-
|
||
|
find_path(ZSTD_INCLUDE_DIR NAMES zstd.h
|
||
|
PATHS ${_zstd_roots}
|
||
|
NO_DEFAULT_PATH
|
||
|
PATH_SUFFIXES "include" )
|
||
|
-find_library(ZSTD_STATIC_LIB NAMES ${ZSTD_STATIC_LIB_NAME} lib${ZSTD_STATIC_LIB_NAME}
|
||
|
+find_library(ZSTD_STATIC_LIB NAMES libzstd libzstd_static zstd zstd_static
|
||
|
PATHS ${_zstd_roots}
|
||
|
NO_DEFAULT_PATH
|
||
|
PATH_SUFFIXES "lib" )
|
||
|
diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
|
||
|
index a888e92..0fe3629 100644
|
||
|
--- a/cmake_modules/ThirdpartyToolchain.cmake
|
||
|
+++ b/cmake_modules/ThirdpartyToolchain.cmake
|
||
|
@@ -119,6 +119,7 @@ endif()
|
||
|
set(Boost_DEBUG TRUE)
|
||
|
set(Boost_USE_MULTITHREADED ON)
|
||
|
set(Boost_ADDITIONAL_VERSIONS
|
||
|
+ "1.65.0" "1.65"
|
||
|
"1.64.0" "1.64"
|
||
|
"1.63.0" "1.63"
|
||
|
"1.62.0" "1.61"
|