diff options
133 files changed, 1816 insertions, 1289 deletions
diff --git a/ports/arrow/CONTROL b/ports/arrow/CONTROL index dd7bea53c..cedc63bf4 100644 --- a/ports/arrow/CONTROL +++ b/ports/arrow/CONTROL @@ -1,4 +1,4 @@ Source: arrow -Version: 0.9.0-1 -Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags +Version: 0.11.1 +Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags, thrift, double-conversion, glog Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations. diff --git a/ports/arrow/all.patch b/ports/arrow/all.patch index bb67ec13f..31be15f5b 100644 --- a/ports/arrow/all.patch +++ b/ports/arrow/all.patch @@ -1,28 +1,57 @@ -diff --git a/cpp/cmake_modules/FindBrotli.cmake b/cpp/cmake_modules/FindBrotli.cmake -index ea971f0..3e98ede 100644 ---- a/cpp/cmake_modules/FindBrotli.cmake -+++ b/cpp/cmake_modules/FindBrotli.cmake -@@ -43,53 +43,31 @@ find_path( BROTLI_INCLUDE_DIR NAMES brotli/decode.h - NO_DEFAULT_PATH +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4448b98..d6aa484 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -743,10 +743,10 @@ elseif (PTHREAD_LIBRARY) + # linking order. + set(ARROW_LINK_LIBS + ${ARROW_LINK_LIBS} +- ${PTHREAD_LIBRARY}) ++ pthreadshared) + set(ARROW_STATIC_LINK_LIBS + ${ARROW_STATIC_LINK_LIBS} +- ${PTHREAD_LIBRARY}) ++ pthreadshared) + endif() + + ############################################################ +@@ -780,3 +780,4 @@ endif() + if(ARROW_GANDIVA) + add_subdirectory(src/gandiva) + endif() ++ +diff --git a/cmake_modules/FindBrotli.cmake b/cmake_modules/FindBrotli.cmake +index ea971f0..e8dfb3c 100644 +--- a/cmake_modules/FindBrotli.cmake ++++ b/cmake_modules/FindBrotli.cmake +@@ -39,57 +39,27 @@ elseif ( Brotli_HOME ) + endif() + + find_path( BROTLI_INCLUDE_DIR NAMES brotli/decode.h +- PATHS ${_brotli_roots} +- NO_DEFAULT_PATH PATH_SUFFIXES "include" ) -find_library( BROTLI_LIBRARY_ENC NAMES libbrotlienc.a libbrotlienc-static.a brotlienc +- PATHS ${_brotli_roots} +- NO_DEFAULT_PATH +- PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ) +find_library( BROTLI_LIBRARY_ENC NAMES libbrotlienc libbrotlienc-static brotlienc brotlienc-static - PATHS ${_brotli_roots} - NO_DEFAULT_PATH - PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ) ++ PATH_SUFFIXES "lib" ) -find_library( BROTLI_LIBRARY_DEC NAMES libbrotlidec.a libbrotlidec-static.a brotlidec +- PATHS ${_brotli_roots} +- NO_DEFAULT_PATH +- PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ) +find_library( BROTLI_LIBRARY_DEC NAMES libbrotlidec libbrotlidec-static brotlidec brotlidec-static - PATHS ${_brotli_roots} - NO_DEFAULT_PATH - PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ) ++ PATH_SUFFIXES "lib" ) -find_library( BROTLI_LIBRARY_COMMON NAMES libbrotlicommon.a libbrotlicommon-static.a brotlicommon +- PATHS ${_brotli_roots} +- NO_DEFAULT_PATH +- PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ) +find_library( BROTLI_LIBRARY_COMMON NAMES libbrotlicommon libbrotlicommon-static brotlicommon brotlicommon-static - PATHS ${_brotli_roots} - NO_DEFAULT_PATH - PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ) ++ PATH_SUFFIXES "lib" ) set(BROTLI_LIBRARIES ${BROTLI_LIBRARY_ENC} ${BROTLI_LIBRARY_DEC} ${BROTLI_LIBRARY_COMMON}) @@ -65,30 +94,103 @@ index ea971f0..3e98ede 100644 else () set(BROTLI_FOUND FALSE) endif () -diff --git a/cpp/cmake_modules/FindFlatbuffers.cmake b/cpp/cmake_modules/FindFlatbuffers.cmake -index 804f479..baac84e 100644 ---- a/cpp/cmake_modules/FindFlatbuffers.cmake -+++ b/cpp/cmake_modules/FindFlatbuffers.cmake -@@ -53,6 +53,7 @@ endif () +diff --git a/cmake_modules/FindFlatbuffers.cmake b/cmake_modules/FindFlatbuffers.cmake +index 975c869..9cee8a0 100644 +--- a/cmake_modules/FindFlatbuffers.cmake ++++ b/cmake_modules/FindFlatbuffers.cmake +@@ -31,31 +31,26 @@ + # FLATBUFFERS_STATIC_LIB, path to libflatbuffers.a + # FLATBUFFERS_FOUND, whether flatbuffers has been found + +-if( NOT "${FLATBUFFERS_HOME}" STREQUAL "") +- file( TO_CMAKE_PATH "${FLATBUFFERS_HOME}" _native_path ) +- list( APPEND _flatbuffers_roots "${_native_path}" ) +-elseif ( Flatbuffers_HOME ) +- list( APPEND _flatbuffers_roots "${Flatbuffers_HOME}" ) ++if(WIN32) ++ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") ++ set(FLATBUFFERS_LIB_SUFFIX mdd) ++ else() ++ set(FLATBUFFERS_LIB_SUFFIX md) ++ endif() ++else() ++ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") ++ set(FLATBUFFERS_LIB_SUFFIX "d") ++ else() ++ set(FLATBUFFERS_LIB_SUFFIX "") ++ endif() + endif() + +-# Try the parameterized roots, if they exist +-if ( _flatbuffers_roots ) +- find_path( FLATBUFFERS_INCLUDE_DIR NAMES flatbuffers/flatbuffers.h +- PATHS "${_flatbuffers_roots}" NO_DEFAULT_PATH +- PATH_SUFFIXES "include" ) +- find_library( FLATBUFFERS_LIBRARIES NAMES flatbuffers +- PATHS "${_flatbuffers_roots}" NO_DEFAULT_PATH +- PATH_SUFFIXES "lib" "lib64") +-else () +- find_path( FLATBUFFERS_INCLUDE_DIR NAMES flatbuffers/flatbuffers.h ) +- find_library( FLATBUFFERS_LIBRARIES NAMES flatbuffers ) +-endif () ++find_path( FLATBUFFERS_INCLUDE_DIR NAMES flatbuffers/flatbuffers.h ) ++find_library( FLATBUFFERS_LIBRARIES NAMES flatbuffers ) find_program(FLATBUFFERS_COMPILER flatc - "${FLATBUFFERS_HOME}/bin" +- "${FLATBUFFERS_HOME}/bin" +- /usr/local/bin +- /usr/bin +- NO_DEFAULT_PATH ++ PATH_SUFFIXES + "${FLATBUFFERS_HOME}/tools/flatbuffers" - /usr/local/bin - /usr/bin - NO_DEFAULT_PATH -diff --git a/cpp/cmake_modules/FindLz4.cmake b/cpp/cmake_modules/FindLz4.cmake -index 3a89c8d..3157197 100644 ---- a/cpp/cmake_modules/FindLz4.cmake -+++ b/cpp/cmake_modules/FindLz4.cmake -@@ -29,21 +29,11 @@ elseif ( Lz4_HOME ) + ) + + if (FLATBUFFERS_INCLUDE_DIR AND FLATBUFFERS_LIBRARIES) +diff --git a/cmake_modules/FindGLOG.cmake b/cmake_modules/FindGLOG.cmake +index f22e4df..53e545b 100644 +--- a/cmake_modules/FindGLOG.cmake ++++ b/cmake_modules/FindGLOG.cmake +@@ -29,11 +29,6 @@ + # GLOG_STATIC_LIB, path to libglog.a + # GLOG_FOUND, whether glog has been found + +-if( NOT "${GLOG_HOME}" STREQUAL "") +- file( TO_CMAKE_PATH "${GLOG_HOME}" _native_path ) +- list( APPEND _glog_roots ${_native_path} ) +-endif() +- + message(STATUS "GLOG_HOME: ${GLOG_HOME}") + # Try the parameterized roots, if they exist + if ( _glog_roots ) +@@ -43,10 +38,10 @@ if ( _glog_roots ) + endif () + + find_path( GLOG_INCLUDE_DIR NAMES glog/logging.h +- PATHS ${_glog_roots} NO_DEFAULT_PATH ++ PATHS ${_glog_roots} + PATH_SUFFIXES "include" ) + find_library( GLOG_LIBRARIES NAMES glog +- PATHS ${_glog_roots} NO_DEFAULT_PATH ++ PATHS ${_glog_roots} + PATH_SUFFIXES ${lib_dirs}) + else () + find_path( GLOG_INCLUDE_DIR NAMES glog/logging.h ) +diff --git a/cmake_modules/FindLz4.cmake b/cmake_modules/FindLz4.cmake +index 3a89c8d..1e068b4 100644 +--- a/cmake_modules/FindLz4.cmake ++++ b/cmake_modules/FindLz4.cmake +@@ -29,23 +29,16 @@ elseif ( Lz4_HOME ) list( APPEND _lz4_roots ${Lz4_HOME} ) endif() -if (MSVC AND NOT DEFINED LZ4_MSVC_STATIC_LIB_SUFFIX) - set(LZ4_MSVC_STATIC_LIB_SUFFIX "_static") --endif() -- ++if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") ++ set(LZ4_LIB_NAME lz4d) ++else() ++ set(LZ4_LIB_NAME lz4) + endif() + -set(LZ4_STATIC_LIB_SUFFIX - "${LZ4_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") - @@ -96,52 +198,1153 @@ index 3a89c8d..3157197 100644 - ${CMAKE_STATIC_LIBRARY_PREFIX}lz4${LZ4_STATIC_LIB_SUFFIX}) - find_path(LZ4_INCLUDE_DIR NAMES lz4.h - PATHS ${_lz4_roots} - NO_DEFAULT_PATH +- PATHS ${_lz4_roots} +- NO_DEFAULT_PATH PATH_SUFFIXES "include" ) -find_library(LZ4_STATIC_LIB NAMES ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME} -+find_library(LZ4_STATIC_LIB NAMES lz4 liblz4 - PATHS ${_lz4_roots} - NO_DEFAULT_PATH +- PATHS ${_lz4_roots} +- NO_DEFAULT_PATH ++ ++find_library(LZ4_STATIC_LIB NAMES ${LZ4_LIB_NAME} PATH_SUFFIXES "lib" ) -diff --git a/cpp/cmake_modules/FindSnappy.cmake b/cpp/cmake_modules/FindSnappy.cmake -index 867963c..8a432db 100644 ---- a/cpp/cmake_modules/FindSnappy.cmake -+++ b/cpp/cmake_modules/FindSnappy.cmake -@@ -55,7 +55,7 @@ if (SNAPPY_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR SNAPPY_LIBRARIES)) + + include(FindPackageHandleStandardArgs) +diff --git a/cmake_modules/FindSnappy.cmake b/cmake_modules/FindSnappy.cmake +index 867963c..fd45321 100644 +--- a/cmake_modules/FindSnappy.cmake ++++ b/cmake_modules/FindSnappy.cmake +@@ -31,31 +31,23 @@ + # SNAPPY_SHARED_LIB, path to libsnappy's shared library + # SNAPPY_FOUND, whether snappy has been found + +-if( NOT "${SNAPPY_HOME}" STREQUAL "") +- file( TO_CMAKE_PATH "${SNAPPY_HOME}" _native_path ) +- list( APPEND _snappy_roots ${_native_path} ) +-elseif ( Snappy_HOME ) +- list( APPEND _snappy_roots ${Snappy_HOME} ) +-endif() +- +-message(STATUS "SNAPPY_HOME: ${SNAPPY_HOME}") +-find_path(SNAPPY_INCLUDE_DIR snappy.h HINTS +- ${_snappy_roots} +- NO_DEFAULT_PATH ++find_path(SNAPPY_INCLUDE_DIR snappy.h + PATH_SUFFIXES "include") + +-find_library( SNAPPY_LIBRARIES NAMES snappy PATHS +- ${_snappy_roots} +- NO_DEFAULT_PATH +- PATH_SUFFIXES "lib") ++if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") ++ set(SNAPPY_LIB_NAME snappyd) ++else() ++ set(SNAPPY_LIB_NAME snappy) ++endif() ++ ++find_library( SNAPPY_LIBRARIES NAMES ${SNAPPY_LIB_NAME} PATH_SUFFIXES "lib") + + if (SNAPPY_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR SNAPPY_LIBRARIES)) + set(SNAPPY_FOUND TRUE) + get_filename_component( SNAPPY_LIBS ${SNAPPY_LIBRARIES} PATH ) set(SNAPPY_HEADER_NAME snappy.h) set(SNAPPY_HEADER ${SNAPPY_INCLUDE_DIR}/${SNAPPY_HEADER_NAME}) - set(SNAPPY_LIB_NAME snappy) +- 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/cpp/cmake_modules/FindZLIB.cmake b/cpp/cmake_modules/FindZLIB.cmake -index 78b84f2..56cc887 100644 ---- a/cpp/cmake_modules/FindZLIB.cmake -+++ b/cpp/cmake_modules/FindZLIB.cmake -@@ -61,9 +61,7 @@ if (ZLIB_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR ZLIB_LIBRARIES)) - set(ZLIB_HEADER ${ZLIB_INCLUDE_DIR}/${ZLIB_HEADER_NAME}) - set(ZLIB_LIB_NAME z) - if (MSVC) -- if (NOT ZLIB_MSVC_STATIC_LIB_SUFFIX) -- set(ZLIB_MSVC_STATIC_LIB_SUFFIX libstatic) -- endif() -+ set(ZLIB_MSVC_STATIC_LIB_SUFFIX lib) - 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}) -diff --git a/cpp/cmake_modules/FindZSTD.cmake b/cpp/cmake_modules/FindZSTD.cmake -index 810e5c0..b483471 100644 ---- a/cpp/cmake_modules/FindZSTD.cmake -+++ b/cpp/cmake_modules/FindZSTD.cmake -@@ -43,7 +43,7 @@ find_path(ZSTD_INCLUDE_DIR NAMES zstd.h - PATHS ${_zstd_roots} - NO_DEFAULT_PATH - PATH_SUFFIXES "include" ) +diff --git a/cmake_modules/FindThrift.cmake b/cmake_modules/FindThrift.cmake +index 5402766..6cff9fa 100644 +--- a/cmake_modules/FindThrift.cmake ++++ b/cmake_modules/FindThrift.cmake +@@ -28,41 +28,31 @@ + # THRIFT_STATIC_LIB, THRIFT static library + # THRIFT_FOUND, If false, do not try to use ant + +-# prefer the thrift version supplied in THRIFT_HOME +-if( NOT "${THRIFT_HOME}" STREQUAL "") +- file( TO_CMAKE_PATH "${THRIFT_HOME}" _native_path ) +- list( APPEND _thrift_roots ${_native_path} ) +-elseif ( Thrift_HOME ) +- list( APPEND _thrift_roots ${Thrift_HOME} ) +-endif() +- +-message(STATUS "THRIFT_HOME: ${THRIFT_HOME}") +-find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h HINTS +- ${_thrift_roots} +- NO_DEFAULT_PATH ++find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h + PATH_SUFFIXES "include" + ) + +-find_path(THRIFT_CONTRIB_DIR share/fb303/if/fb303.thrift HINTS +- ${_thrift_roots} +- NO_DEFAULT_PATH +-) +- +-if (MSVC AND NOT THRIFT_MSVC_STATIC_LIB_SUFFIX) +- set(THRIFT_MSVC_STATIC_LIB_SUFFIX md) ++if(WIN32) ++ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") ++ set(THRIFT_LIB_SUFFIX mdd) ++ else() ++ set(THRIFT_LIB_SUFFIX md) ++ endif() ++else() ++ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") ++ set(THRIFT_LIB_SUFFIX "d") ++ else() ++ set(THRIFT_LIB_SUFFIX "") ++ endif() + endif() + + find_library(THRIFT_STATIC_LIB NAMES +- ${CMAKE_STATIC_LIBRARY_PREFIX}thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX} +- HINTS ${_thrift_roots} +- NO_DEFAULT_PATH +- PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ++ thrift${THRIFT_LIB_SUFFIX} ++ PATH_SUFFIXES lib + ) + + find_program(THRIFT_COMPILER thrift HINTS +- ${_thrift_roots} +- NO_DEFAULT_PATH +- PATH_SUFFIXES "bin" ++ PATH_SUFFIXES "tools" + ) + + function(EXTRACT_THRIFT_VERSION) +@@ -111,7 +101,6 @@ else () + endif () + endif () + +- + mark_as_advanced( + THRIFT_STATIC_LIB + THRIFT_COMPILER +diff --git a/cmake_modules/FindZLIB.cmake b/cmake_modules/FindZLIB.cmake +index ca6060b..85a4585 100644 +--- a/cmake_modules/FindZLIB.cmake ++++ b/cmake_modules/FindZLIB.cmake +@@ -30,43 +30,15 @@ + # ZLIB_SHARED_LIB, path to libz's shared library + # ZLIB_FOUND, whether zlib has been found + +-if( NOT "${ZLIB_HOME}" STREQUAL "") +- file( TO_CMAKE_PATH "${ZLIB_HOME}" _native_path ) +- list( APPEND _zlib_roots ${_native_path} ) +-elseif ( ZLIB_HOME ) +- list( APPEND _zlib_roots ${ZLIB_HOME} ) ++if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") ++ set(ZLIB_LIB_NAME_SUFFIX "d") ++else() ++ set(ZLIB_LIB_NAME_SUFFIX "") + endif() + +-if (MSVC) +- # zlib uses zlib.lib for Windows. +- set(ZLIB_LIB_NAME zlib.lib) +-else () +- # zlib uses libz.so for non Windows. +- set(ZLIB_LIB_NAME +- ${CMAKE_SHARED_LIBRARY_PREFIX}z${CMAKE_SHARED_LIBRARY_SUFFIX}) +-endif () +- + # Try the parameterized roots, if they exist +-if (_zlib_roots) +- find_path(ZLIB_INCLUDE_DIR NAMES zlib.h +- PATHS ${_zlib_roots} NO_DEFAULT_PATH +- PATH_SUFFIXES "include") +- find_library(ZLIB_SHARED_LIB +- NAMES ${ZLIB_LIB_NAME} +- PATHS ${_zlib_roots} NO_DEFAULT_PATH +- PATH_SUFFIXES "lib") +-else () +- pkg_check_modules(PKG_ZLIB zlib) +- if (PKG_ZLIB_FOUND) +- set(ZLIB_INCLUDE_DIR ${PKG_ZLIB_INCLUDEDIR}) +- find_library(ZLIB_SHARED_LIB +- NAMES ${ZLIB_LIB_NAME} +- PATHS ${PKG_ZLIB_LIBDIR} NO_DEFAULT_PATH) +- else () +- find_path(ZLIB_INCLUDE_DIR NAMES zlib.h) +- find_library(ZLIB_SHARED_LIB NAMES ${ZLIB_LIB_NAME}) +- endif () +-endif () ++find_path(ZLIB_INCLUDE_DIR NAMES zlib.h PATH_SUFFIXES "include") ++find_library(ZLIB_SHARED_LIB NAMES z zlib${ZLIB_LIB_NAME_SUFFIX} PATH_SUFFIXES "lib") + + if (ZLIB_INCLUDE_DIR AND ZLIB_SHARED_LIB) + set(ZLIB_FOUND TRUE) +diff --git a/cmake_modules/FindZSTD.cmake b/cmake_modules/FindZSTD.cmake +index 810e5c0..d272d8f 100644 +--- a/cmake_modules/FindZSTD.cmake ++++ b/cmake_modules/FindZSTD.cmake +@@ -22,30 +22,16 @@ + # ZSTD_STATIC_LIB, path to libzstd static library + # ZSTD_FOUND, whether zstd has been found + +-if( NOT "${ZSTD_HOME}" STREQUAL "") +- file( TO_CMAKE_PATH "${ZSTD_HOME}" _native_path ) +- list( APPEND _zstd_roots ${_native_path} ) +-elseif ( ZStd_HOME ) +- list( APPEND _zstd_roots ${ZStd_HOME} ) +-endif() ++find_path(ZSTD_INCLUDE_DIR NAMES zstd.h ++ PATH_SUFFIXES "include" ) + +-if (MSVC AND NOT DEFINED ZSTD_MSVC_STATIC_LIB_SUFFIX) +- set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static") ++if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") ++ set(ZSTD_LIB_NAME_SUFFIX "d") ++else() ++ set(ZSTD_LIB_NAME_SUFFIX "") + 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 zstd ${ZSTD_STATIC_LIB_NAME} lib${ZSTD_STATIC_LIB_NAME} - PATHS ${_zstd_roots} - NO_DEFAULT_PATH +- PATHS ${_zstd_roots} +- NO_DEFAULT_PATH ++find_library(ZSTD_STATIC_LIB NAMES zstd${ZSTD_LIB_NAME_SUFFIX} zstd_static${ZSTD_LIB_NAME_SUFFIX} PATH_SUFFIXES "lib" ) + + include(FindPackageHandleStandardArgs) +diff --git a/cmake_modules/Finddouble-conversion.cmake b/cmake_modules/Finddouble-conversion.cmake +new file mode 100644 +index 0000000..4fa0995 +--- /dev/null ++++ b/cmake_modules/Finddouble-conversion.cmake +@@ -0,0 +1,23 @@ ++# Licensed to the Apache Software Foundation (ASF) under one ++# or more contributor license agreements. See the NOTICE file ++# distributed with this work for additional information ++# regarding copyright ownership. The ASF licenses this file ++# to you under the Apache License, Version 2.0 (the ++# "License"); you may not use this file except in compliance ++# with the License. You may obtain a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, ++# software distributed under the License is distributed on an ++# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ++# KIND, either express or implied. See the License for the ++# specific language governing permissions and limitations ++# under the License. ++ ++find_path(DOUBLE_CONVERSION_INCLUDE_DIR NAMES double-conversion.h PATH_SUFFIXES "include/double-conversion" ) ++ ++find_library(DOUBLE_CONVERSION_STATIC_LIB NAMES double-conversion PATH_SUFFIXES "lib" ) ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(DOUBLE_CONVERSION REQUIRED_VARS DOUBLE_CONVERSION_STATIC_LIB DOUBLE_CONVERSION_INCLUDE_DIR) +diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake +index 1c7cd62..572f6e1 100644 +--- a/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cmake_modules/ThirdpartyToolchain.cmake +@@ -302,6 +302,8 @@ if (WIN32) + else() + find_library(PTHREAD_LIBRARY pthread) + message(STATUS "Found pthread: ${PTHREAD_LIBRARY}") ++ add_library(pthreadshared SHARED IMPORTED) ++ set_target_properties(pthreadshared PROPERTIES IMPORTED_LOCATION ${PTHREAD_LIBRARY}) + endif() + + # ---------------------------------------------------------------------- +@@ -322,106 +324,56 @@ set(Boost_ADDITIONAL_VERSIONS + "1.61.0" "1.62" + "1.60.0" "1.60") + +-if (ARROW_BOOST_VENDORED) +- set(BOOST_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/boost_ep-prefix/src/boost_ep") +- set(BOOST_LIB_DIR "${BOOST_PREFIX}/stage/lib") +- set(BOOST_BUILD_LINK "static") +- set(BOOST_STATIC_SYSTEM_LIBRARY +- "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_system${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(BOOST_STATIC_FILESYSTEM_LIBRARY +- "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_filesystem${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(BOOST_STATIC_REGEX_LIBRARY +- "${BOOST_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}boost_regex${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(BOOST_SYSTEM_LIBRARY "${BOOST_STATIC_SYSTEM_LIBRARY}") +- set(BOOST_FILESYSTEM_LIBRARY "${BOOST_STATIC_FILESYSTEM_LIBRARY}") +- set(BOOST_REGEX_LIBRARY "${BOOST_STATIC_REGEX_LIBRARY}") ++if (MSVC) ++ # disable autolinking in boost ++ add_definitions(-DBOOST_ALL_NO_LIB) ++endif() ++if (ARROW_BOOST_USE_SHARED) ++ # Find shared Boost libraries. ++ set(Boost_USE_STATIC_LIBS OFF) ++ ++ if (MSVC) ++ # force all boost libraries to dynamic link ++ add_definitions(-DBOOST_ALL_DYN_LINK) ++ endif() ++ + if (ARROW_BOOST_HEADER_ONLY) +- set(BOOST_BUILD_PRODUCTS) +- set(BOOST_CONFIGURE_COMMAND "") +- set(BOOST_BUILD_COMMAND "") ++ find_package(Boost REQUIRED) + else() +- set(BOOST_BUILD_PRODUCTS +- ${BOOST_SYSTEM_LIBRARY} +- ${BOOST_FILESYSTEM_LIBRARY} +- ${BOOST_REGEX_LIBRARY}) +- set(BOOST_CONFIGURE_COMMAND +- "./bootstrap.sh" +- "--prefix=${BOOST_PREFIX}" +- "--with-libraries=filesystem,regex,system") ++ find_package(Boost COMPONENTS regex system filesystem REQUIRED) + if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG") +- set(BOOST_BUILD_VARIANT "debug") ++ set(BOOST_SHARED_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_DEBUG}) ++ set(BOOST_SHARED_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_DEBUG}) ++ set(BOOST_SHARED_REGEX_LIBRARY ${Boost_REGEX_LIBRARY_DEBUG}) + else() +- set(BOOST_BUILD_VARIANT "release") ++ set(BOOST_SHARED_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_RELEASE}) ++ set(BOOST_SHARED_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_RELEASE}) ++ set(BOOST_SHARED_REGEX_LIBRARY ${Boost_REGEX_LIBRARY_RELEASE}) + endif() +- set(BOOST_BUILD_COMMAND +- "./b2" +- "link=${BOOST_BUILD_LINK}" +- "variant=${BOOST_BUILD_VARIANT}" +- "cxxflags=-fPIC") ++ set(BOOST_SYSTEM_LIBRARY boost_system_shared) ++ set(BOOST_FILESYSTEM_LIBRARY boost_filesystem_shared) ++ set(BOOST_REGEX_LIBRARY boost_regex_shared) + endif() +- ExternalProject_Add(boost_ep +- URL ${BOOST_SOURCE_URL} +- BUILD_BYPRODUCTS ${BOOST_BUILD_PRODUCTS} +- BUILD_IN_SOURCE 1 +- CONFIGURE_COMMAND ${BOOST_CONFIGURE_COMMAND} +- BUILD_COMMAND ${BOOST_BUILD_COMMAND} +- INSTALL_COMMAND "" +- ${EP_LOG_OPTIONS}) +- set(Boost_INCLUDE_DIR "${BOOST_PREFIX}") +- set(Boost_INCLUDE_DIRS "${BOOST_INCLUDE_DIR}") +- add_dependencies(arrow_dependencies boost_ep) + else() +- if (MSVC) +- # disable autolinking in boost +- add_definitions(-DBOOST_ALL_NO_LIB) +- endif() +- if (ARROW_BOOST_USE_SHARED) +- # Find shared Boost libraries. +- set(Boost_USE_STATIC_LIBS OFF) +- +- if (MSVC) +- # force all boost libraries to dynamic link +- add_definitions(-DBOOST_ALL_DYN_LINK) +- endif() +- +- if (ARROW_BOOST_HEADER_ONLY) +- find_package(Boost REQUIRED) +- else() +- find_package(Boost COMPONENTS regex system filesystem REQUIRED) +- if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG") +- set(BOOST_SHARED_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_DEBUG}) +- set(BOOST_SHARED_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_DEBUG}) +- set(BOOST_SHARED_REGEX_LIBRARY ${Boost_REGEX_LIBRARY_DEBUG}) +- else() +- set(BOOST_SHARED_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_RELEASE}) +- set(BOOST_SHARED_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_RELEASE}) +- set(BOOST_SHARED_REGEX_LIBRARY ${Boost_REGEX_LIBRARY_RELEASE}) +- endif() +- set(BOOST_SYSTEM_LIBRARY boost_system_shared) +- set(BOOST_FILESYSTEM_LIBRARY boost_filesystem_shared) +- set(BOOST_REGEX_LIBRARY boost_regex_shared) +- endif() ++ # Find static boost headers and libs ++ # TODO Differentiate here between release and debug builds ++ set(Boost_USE_STATIC_LIBS ON) ++ if (ARROW_BOOST_HEADER_ONLY) ++ find_package(Boost REQUIRED) + else() +- # Find static boost headers and libs +- # TODO Differentiate here between release and debug builds +- set(Boost_USE_STATIC_LIBS ON) +- if (ARROW_BOOST_HEADER_ONLY) +- find_package(Boost REQUIRED) ++ find_package(Boost COMPONENTS regex system filesystem REQUIRED) ++ if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG") ++ set(BOOST_STATIC_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_DEBUG}) ++ set(BOOST_STATIC_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_DEBUG}) ++ set(BOOST_STATIC_REGEX_LIBRARY ${Boost_REGEX_LIBRARY_DEBUG}) + else() +- find_package(Boost COMPONENTS regex system filesystem REQUIRED) +- if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG") +- set(BOOST_STATIC_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_DEBUG}) +- set(BOOST_STATIC_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_DEBUG}) +- set(BOOST_STATIC_REGEX_LIBRARY ${Boost_REGEX_LIBRARY_DEBUG}) +- else() +- set(BOOST_STATIC_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_RELEASE}) +- set(BOOST_STATIC_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_RELEASE}) +- set(BOOST_STATIC_REGEX_LIBRARY ${Boost_REGEX_LIBRARY_RELEASE}) +- endif() +- set(BOOST_SYSTEM_LIBRARY boost_system_static) +- set(BOOST_FILESYSTEM_LIBRARY boost_filesystem_static) +- set(BOOST_REGEX_LIBRARY boost_regex_static) ++ set(BOOST_STATIC_SYSTEM_LIBRARY ${Boost_SYSTEM_LIBRARY_RELEASE}) ++ set(BOOST_STATIC_FILESYSTEM_LIBRARY ${Boost_FILESYSTEM_LIBRARY_RELEASE}) ++ set(BOOST_STATIC_REGEX_LIBRARY ${Boost_REGEX_LIBRARY_RELEASE}) + endif() ++ set(BOOST_SYSTEM_LIBRARY boost_system_static) ++ set(BOOST_FILESYSTEM_LIBRARY boost_filesystem_static) ++ set(BOOST_REGEX_LIBRARY boost_regex_static) + endif() + endif() + +@@ -449,28 +401,8 @@ include_directories(SYSTEM ${Boost_INCLUDE_DIR}) + # ---------------------------------------------------------------------- + # Google double-conversion + +-if("${DOUBLE_CONVERSION_HOME}" STREQUAL "") +- set(DOUBLE_CONVERSION_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/double-conversion_ep/src/double-conversion_ep") +- set(DOUBLE_CONVERSION_HOME "${DOUBLE_CONVERSION_PREFIX}") +- set(DOUBLE_CONVERSION_INCLUDE_DIR "${DOUBLE_CONVERSION_PREFIX}/include") +- set(DOUBLE_CONVERSION_STATIC_LIB "${DOUBLE_CONVERSION_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}double-conversion${CMAKE_STATIC_LIBRARY_SUFFIX}") +- +- set(DOUBLE_CONVERSION_CMAKE_ARGS +- "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" +- "-DCMAKE_CXX_FLAGS=${EP_CXX_FLAGS}" +- "-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS}" +- "-DCMAKE_INSTALL_PREFIX=${DOUBLE_CONVERSION_PREFIX}") +- ExternalProject_Add(double-conversion_ep +- ${EP_LOG_OPTIONS} +- INSTALL_DIR ${DOUBLE_CONVERSION_PREFIX} +- URL ${DOUBLE_CONVERSION_SOURCE_URL} +- CMAKE_ARGS ${DOUBLE_CONVERSION_CMAKE_ARGS} +- BUILD_BYPRODUCTS "${DOUBLE_CONVERSION_STATIC_LIB}") +- set(DOUBLE_CONVERSION_VENDORED 1) +-else() +- find_package(double-conversion REQUIRED) +- set(DOUBLE_CONVERSION_VENDORED 0) +-endif() ++find_package(double-conversion REQUIRED) ++set(DOUBLE_CONVERSION_VENDORED 0) + + include_directories(SYSTEM ${DOUBLE_CONVERSION_INCLUDE_DIR}) + ADD_THIRDPARTY_LIB(double-conversion +@@ -486,38 +418,8 @@ endif() + if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS) + add_custom_target(unittest ctest -L unittest) + +- if("${GTEST_HOME}" STREQUAL "") +- if(APPLE) +- set(GTEST_CMAKE_CXX_FLAGS "-fPIC -DGTEST_USE_OWN_TR1_TUPLE=1 -Wno-unused-value -Wno-ignored-attributes") +- elseif(NOT MSVC) +- set(GTEST_CMAKE_CXX_FLAGS "-fPIC") +- endif() +- string(TOUPPER ${CMAKE_BUILD_TYPE} UPPERCASE_BUILD_TYPE) +- set(GTEST_CMAKE_CXX_FLAGS "${EP_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}} ${GTEST_CMAKE_CXX_FLAGS}") +- +- set(GTEST_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/googletest_ep-prefix/src/googletest_ep") +- set(GTEST_INCLUDE_DIR "${GTEST_PREFIX}/include") +- set(GTEST_STATIC_LIB +- "${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(GTEST_MAIN_STATIC_LIB +- "${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(GTEST_VENDORED 1) +- set(GTEST_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- -DCMAKE_INSTALL_PREFIX=${GTEST_PREFIX} +- -DCMAKE_CXX_FLAGS=${GTEST_CMAKE_CXX_FLAGS}) +- if (MSVC AND NOT ARROW_USE_STATIC_CRT) +- set(GTEST_CMAKE_ARGS ${GTEST_CMAKE_ARGS} -Dgtest_force_shared_crt=ON) +- endif() +- +- ExternalProject_Add(googletest_ep +- URL ${GTEST_SOURCE_URL} +- BUILD_BYPRODUCTS ${GTEST_STATIC_LIB} ${GTEST_MAIN_STATIC_LIB} +- CMAKE_ARGS ${GTEST_CMAKE_ARGS} +- ${EP_LOG_OPTIONS}) +- else() +- find_package(GTest REQUIRED) +- set(GTEST_VENDORED 0) +- endif() ++ find_package(GTest REQUIRED) ++ set(GTEST_VENDORED 0) + + message(STATUS "GTest include dir: ${GTEST_INCLUDE_DIR}") + message(STATUS "GTest static library: ${GTEST_STATIC_LIB}") +@@ -533,40 +435,8 @@ if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS) + endif() + + # gflags (formerly Googleflags) command line parsing +- if("${GFLAGS_HOME}" STREQUAL "") +- set(GFLAGS_CMAKE_CXX_FLAGS ${EP_CXX_FLAGS}) +- +- set(GFLAGS_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/gflags_ep-prefix/src/gflags_ep") +- set(GFLAGS_HOME "${GFLAGS_PREFIX}") +- set(GFLAGS_INCLUDE_DIR "${GFLAGS_PREFIX}/include") +- if(MSVC) +- set(GFLAGS_STATIC_LIB "${GFLAGS_PREFIX}/lib/gflags_static.lib") +- else() +- set(GFLAGS_STATIC_LIB "${GFLAGS_PREFIX}/lib/libgflags.a") +- endif() +- set(GFLAGS_VENDORED 1) +- set(GFLAGS_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- -DCMAKE_INSTALL_PREFIX=${GFLAGS_PREFIX} +- -DBUILD_SHARED_LIBS=OFF +- -DBUILD_STATIC_LIBS=ON +- -DBUILD_PACKAGING=OFF +- -DBUILD_TESTING=OFF +- -BUILD_CONFIG_TESTS=OFF +- -DINSTALL_HEADERS=ON +- -DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS} +- -DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_C_FLAGS} +- -DCMAKE_CXX_FLAGS=${GFLAGS_CMAKE_CXX_FLAGS}) +- +- ExternalProject_Add(gflags_ep +- URL ${GFLAGS_SOURCE_URL} +- ${EP_LOG_OPTIONS} +- BUILD_IN_SOURCE 1 +- BUILD_BYPRODUCTS "${GFLAGS_STATIC_LIB}" +- CMAKE_ARGS ${GFLAGS_CMAKE_ARGS}) +- else() +- set(GFLAGS_VENDORED 0) +- find_package(GFlags REQUIRED) +- endif() ++ set(GFLAGS_VENDORED 0) ++ find_package(GFlags REQUIRED) + + message(STATUS "GFlags include dir: ${GFLAGS_INCLUDE_DIR}") + message(STATUS "GFlags static library: ${GFLAGS_STATIC_LIB}") +@@ -587,37 +457,8 @@ endif() + if(ARROW_BUILD_BENCHMARKS) + add_custom_target(runbenchmark ctest -L benchmark) + +- if("$ENV{GBENCHMARK_HOME}" STREQUAL "") +- if(NOT MSVC) +- set(GBENCHMARK_CMAKE_CXX_FLAGS "-fPIC -std=c++11 ${EP_CXX_FLAGS}") +- endif() +- +- if(APPLE) +- set(GBENCHMARK_CMAKE_CXX_FLAGS "${GBENCHMARK_CMAKE_CXX_FLAGS} -stdlib=libc++") +- endif() +- +- set(GBENCHMARK_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/gbenchmark_ep/src/gbenchmark_ep-install") +- set(GBENCHMARK_INCLUDE_DIR "${GBENCHMARK_PREFIX}/include") +- set(GBENCHMARK_STATIC_LIB "${GBENCHMARK_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}benchmark${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(GBENCHMARK_VENDORED 1) +- set(GBENCHMARK_CMAKE_ARGS +- "-DCMAKE_BUILD_TYPE=Release" +- "-DCMAKE_INSTALL_PREFIX:PATH=${GBENCHMARK_PREFIX}" +- "-DBENCHMARK_ENABLE_TESTING=OFF" +- "-DCMAKE_CXX_FLAGS=${GBENCHMARK_CMAKE_CXX_FLAGS}") +- if (APPLE) +- set(GBENCHMARK_CMAKE_ARGS ${GBENCHMARK_CMAKE_ARGS} "-DBENCHMARK_USE_LIBCXX=ON") +- endif() +- +- ExternalProject_Add(gbenchmark_ep +- URL ${GBENCHMARK_SOURCE_URL} +- BUILD_BYPRODUCTS "${GBENCHMARK_STATIC_LIB}" +- CMAKE_ARGS ${GBENCHMARK_CMAKE_ARGS} +- ${EP_LOG_OPTIONS}) +- else() +- find_package(GBenchmark REQUIRED) +- set(GBENCHMARK_VENDORED 0) +- endif() ++ find_package(GBenchmark REQUIRED) ++ set(GBENCHMARK_VENDORED 0) + + message(STATUS "GBenchmark include dir: ${GBENCHMARK_INCLUDE_DIR}") + message(STATUS "GBenchmark static library: ${GBENCHMARK_STATIC_LIB}") +@@ -632,24 +473,8 @@ endif() + + if (ARROW_IPC) + # RapidJSON, header only dependency +- if("${RAPIDJSON_HOME}" STREQUAL "") +- ExternalProject_Add(rapidjson_ep +- PREFIX "${CMAKE_BINARY_DIR}" +- URL ${RAPIDJSON_SOURCE_URL} +- URL_MD5 ${RAPIDJSON_SOURCE_MD5} +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- BUILD_IN_SOURCE 1 +- ${EP_LOG_OPTIONS} +- INSTALL_COMMAND "") +- +- ExternalProject_Get_Property(rapidjson_ep SOURCE_DIR) +- set(RAPIDJSON_INCLUDE_DIR "${SOURCE_DIR}/include") +- set(RAPIDJSON_VENDORED 1) +- else() +- set(RAPIDJSON_INCLUDE_DIR "${RAPIDJSON_HOME}/include") +- set(RAPIDJSON_VENDORED 0) +- endif() ++ set(RAPIDJSON_INCLUDE_DIR "${RAPIDJSON_HOME}/include") ++ set(RAPIDJSON_VENDORED 0) + message(STATUS "RapidJSON include dir: ${RAPIDJSON_INCLUDE_DIR}") + include_directories(SYSTEM ${RAPIDJSON_INCLUDE_DIR}) + +@@ -658,32 +483,8 @@ if (ARROW_IPC) + endif() + + ## Flatbuffers +- if("${FLATBUFFERS_HOME}" STREQUAL "") +- set(FLATBUFFERS_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/flatbuffers_ep-prefix/src/flatbuffers_ep-install") +- if (MSVC) +- set(FLATBUFFERS_CMAKE_CXX_FLAGS /EHsc) +- else() +- set(FLATBUFFERS_CMAKE_CXX_FLAGS -fPIC) +- endif() +- # We always need to do release builds, otherwise flatc will not be installed. +- ExternalProject_Add(flatbuffers_ep +- URL ${FLATBUFFERS_SOURCE_URL} +- CMAKE_ARGS +- "-DCMAKE_CXX_FLAGS=${FLATBUFFERS_CMAKE_CXX_FLAGS}" +- "-DCMAKE_INSTALL_PREFIX:PATH=${FLATBUFFERS_PREFIX}" +- "-DFLATBUFFERS_BUILD_TESTS=OFF" +- "-DCMAKE_BUILD_TYPE=RELEASE" +- "-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS}" +- "-DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_C_FLAGS}" +- ${EP_LOG_OPTIONS}) +- +- set(FLATBUFFERS_INCLUDE_DIR "${FLATBUFFERS_PREFIX}/include") +- set(FLATBUFFERS_COMPILER "${FLATBUFFERS_PREFIX}/bin/flatc") +- set(FLATBUFFERS_VENDORED 1) +- else() +- find_package(Flatbuffers REQUIRED) +- set(FLATBUFFERS_VENDORED 0) +- endif() ++ find_package(Flatbuffers REQUIRED) ++ set(FLATBUFFERS_VENDORED 0) + + if(FLATBUFFERS_VENDORED) + add_dependencies(arrow_dependencies flatbuffers_ep) +@@ -787,34 +588,7 @@ if (ARROW_WITH_ZLIB) + if(ZLIB_FOUND) + ADD_THIRDPARTY_LIB(zlib SHARED_LIB ${ZLIB_SHARED_LIB}) + else() +- set(ZLIB_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/zlib_ep/src/zlib_ep-install") +- set(ZLIB_HOME "${ZLIB_PREFIX}") +- set(ZLIB_INCLUDE_DIR "${ZLIB_PREFIX}/include") +- if (MSVC) +- if (${UPPERCASE_BUILD_TYPE} STREQUAL "DEBUG") +- set(ZLIB_STATIC_LIB_NAME zlibstaticd.lib) +- else() +- set(ZLIB_STATIC_LIB_NAME zlibstatic.lib) +- endif() +- else() +- set(ZLIB_STATIC_LIB_NAME libz.a) +- endif() +- set(ZLIB_STATIC_LIB "${ZLIB_PREFIX}/lib/${ZLIB_STATIC_LIB_NAME}") +- set(ZLIB_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- -DCMAKE_INSTALL_PREFIX=${ZLIB_PREFIX} +- -DCMAKE_C_FLAGS=${EP_C_FLAGS} +- -DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS} +- -DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_C_FLAGS} +- -DBUILD_SHARED_LIBS=OFF) +- ADD_THIRDPARTY_LIB(zlib +- STATIC_LIB ${ZLIB_STATIC_LIB}) +- +- ExternalProject_Add(zlib_ep +- URL ${ZLIB_SOURCE_URL} +- ${EP_LOG_OPTIONS} +- BUILD_BYPRODUCTS "${ZLIB_STATIC_LIB}" +- CMAKE_ARGS ${ZLIB_CMAKE_ARGS}) +- add_dependencies(zlib zlib_ep) ++ message(FATAL_ERROR "zlib not found.") + endif() + + include_directories(SYSTEM ${ZLIB_INCLUDE_DIR}) +@@ -824,62 +598,8 @@ if (ARROW_WITH_SNAPPY) + # ---------------------------------------------------------------------- + # Snappy + +- if("${SNAPPY_HOME}" STREQUAL "") +- set(SNAPPY_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/snappy_ep/src/snappy_ep-install") +- set(SNAPPY_HOME "${SNAPPY_PREFIX}") +- set(SNAPPY_INCLUDE_DIR "${SNAPPY_PREFIX}/include") +- if (MSVC) +- set(SNAPPY_STATIC_LIB_NAME snappy_static) +- else() +- set(SNAPPY_STATIC_LIB_NAME snappy) +- endif() +- set(SNAPPY_STATIC_LIB "${SNAPPY_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_STATIC_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}") +- +- if (${UPPERCASE_BUILD_TYPE} EQUAL "RELEASE") +- if (APPLE) +- set(SNAPPY_CXXFLAGS "CXXFLAGS='-DNDEBUG -O1'") +- else() +- set(SNAPPY_CXXFLAGS "CXXFLAGS='-DNDEBUG -O2'") +- endif() +- endif() +- +- if (WIN32) +- set(SNAPPY_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- "-DCMAKE_CXX_FLAGS=${EP_CXX_FLAGS}" +- "-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS}" +- "-DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_C_FLAGS}" +- "-DCMAKE_C_FLAGS=${EP_C_FLAGS}" +- "-DCMAKE_INSTALL_PREFIX=${SNAPPY_PREFIX}") +- set(SNAPPY_UPDATE_COMMAND ${CMAKE_COMMAND} -E copy +- ${CMAKE_SOURCE_DIR}/cmake_modules/SnappyCMakeLists.txt +- ./CMakeLists.txt && +- ${CMAKE_COMMAND} -E copy +- ${CMAKE_SOURCE_DIR}/cmake_modules/SnappyConfig.h +- ./config.h) +- ExternalProject_Add(snappy_ep +- UPDATE_COMMAND ${SNAPPY_UPDATE_COMMAND} +- ${EP_LOG_OPTIONS} +- BUILD_IN_SOURCE 1 +- BUILD_COMMAND ${MAKE} +- INSTALL_DIR ${SNAPPY_PREFIX} +- URL ${SNAPPY_SOURCE_URL} +- CMAKE_ARGS ${SNAPPY_CMAKE_ARGS} +- BUILD_BYPRODUCTS "${SNAPPY_STATIC_LIB}") +- else() +- ExternalProject_Add(snappy_ep +- CONFIGURE_COMMAND ./configure --with-pic "--prefix=${SNAPPY_PREFIX}" ${SNAPPY_CXXFLAGS} +- ${EP_LOG_OPTIONS} +- BUILD_IN_SOURCE 1 +- BUILD_COMMAND ${MAKE} +- INSTALL_DIR ${SNAPPY_PREFIX} +- URL ${SNAPPY_SOURCE_URL} +- BUILD_BYPRODUCTS "${SNAPPY_STATIC_LIB}") +- endif() +- set(SNAPPY_VENDORED 1) +- else() +- find_package(Snappy REQUIRED) +- set(SNAPPY_VENDORED 0) +- endif() ++ find_package(Snappy REQUIRED) ++ set(SNAPPY_VENDORED 0) + + include_directories(SYSTEM ${SNAPPY_INCLUDE_DIR}) + ADD_THIRDPARTY_LIB(snappy +@@ -894,47 +614,8 @@ if (ARROW_WITH_BROTLI) + # ---------------------------------------------------------------------- + # Brotli + +- if("${BROTLI_HOME}" STREQUAL "") +- set(BROTLI_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/brotli_ep/src/brotli_ep-install") +- set(BROTLI_HOME "${BROTLI_PREFIX}") +- set(BROTLI_INCLUDE_DIR "${BROTLI_PREFIX}/include") +- if (MSVC) +- set(BROTLI_LIB_DIR bin) +- else() +- set(BROTLI_LIB_DIR lib) +- endif() +- set(BROTLI_STATIC_LIBRARY_ENC "${BROTLI_PREFIX}/${BROTLI_LIB_DIR}/${CMAKE_LIBRARY_ARCHITECTURE}/${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(BROTLI_STATIC_LIBRARY_DEC "${BROTLI_PREFIX}/${BROTLI_LIB_DIR}/${CMAKE_LIBRARY_ARCHITECTURE}/${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(BROTLI_STATIC_LIBRARY_COMMON "${BROTLI_PREFIX}/${BROTLI_LIB_DIR}/${CMAKE_LIBRARY_ARCHITECTURE}/${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(BROTLI_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- "-DCMAKE_CXX_FLAGS=${EP_CXX_FLAGS}" +- "-DCMAKE_C_FLAGS=${EP_C_FLAGS}" +- "-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS}" +- "-DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_C_FLAGS}" +- -DCMAKE_INSTALL_PREFIX=${BROTLI_PREFIX} +- -DCMAKE_INSTALL_LIBDIR=lib/${CMAKE_LIBRARY_ARCHITECTURE} +- -DBUILD_SHARED_LIBS=OFF) +- +- ExternalProject_Add(brotli_ep +- URL ${BROTLI_SOURCE_URL} +- BUILD_BYPRODUCTS "${BROTLI_STATIC_LIBRARY_ENC}" "${BROTLI_STATIC_LIBRARY_DEC}" "${BROTLI_STATIC_LIBRARY_COMMON}" +- ${BROTLI_BUILD_BYPRODUCTS} +- ${EP_LOG_OPTIONS} +- CMAKE_ARGS ${BROTLI_CMAKE_ARGS} +- STEP_TARGETS headers_copy) +- if (MSVC) +- ExternalProject_Get_Property(brotli_ep SOURCE_DIR) +- +- ExternalProject_Add_Step(brotli_ep headers_copy +- COMMAND xcopy /E /I include ..\\..\\..\\brotli_ep\\src\\brotli_ep-install\\include /Y +- DEPENDEES build +- WORKING_DIRECTORY ${SOURCE_DIR}) +- endif() +- set(BROTLI_VENDORED 1) +- else() +- find_package(Brotli REQUIRED) +- set(BROTLI_VENDORED 0) +- endif() ++ find_package(Brotli REQUIRED) ++ set(BROTLI_VENDORED 0) + + include_directories(SYSTEM ${BROTLI_INCLUDE_DIR}) + ADD_THIRDPARTY_LIB(brotli_enc +@@ -955,45 +636,8 @@ if (ARROW_WITH_LZ4) + # ---------------------------------------------------------------------- + # Lz4 + +- if("${LZ4_HOME}" STREQUAL "") +- set(LZ4_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/lz4_ep-prefix/src/lz4_ep") +- set(LZ4_HOME "${LZ4_BUILD_DIR}") +- set(LZ4_INCLUDE_DIR "${LZ4_BUILD_DIR}/lib") +- +- if (MSVC) +- if (ARROW_USE_STATIC_CRT) +- if (${UPPERCASE_BUILD_TYPE} STREQUAL "DEBUG") +- set(LZ4_RUNTIME_LIBRARY_LINKAGE "/p:RuntimeLibrary=MultiThreadedDebug") +- else() +- set(LZ4_RUNTIME_LIBRARY_LINKAGE "/p:RuntimeLibrary=MultiThreaded") +- endif() +- endif() +- set(LZ4_STATIC_LIB "${LZ4_BUILD_DIR}/visual/VS2010/bin/x64_${CMAKE_BUILD_TYPE}/liblz4_static.lib") +- set(LZ4_BUILD_COMMAND BUILD_COMMAND msbuild.exe /m /p:Configuration=${CMAKE_BUILD_TYPE} /p:Platform=x64 /p:PlatformToolset=v140 +- ${LZ4_RUNTIME_LIBRARY_LINKAGE} /t:Build ${LZ4_BUILD_DIR}/visual/VS2010/lz4.sln) +- set(LZ4_PATCH_COMMAND PATCH_COMMAND git --git-dir=. apply --verbose --whitespace=fix ${CMAKE_SOURCE_DIR}/build-support/lz4_msbuild_gl_runtimelibrary_params.patch) +- else() +- set(LZ4_STATIC_LIB "${LZ4_BUILD_DIR}/lib/liblz4.a") +- set(LZ4_BUILD_COMMAND BUILD_COMMAND ${CMAKE_SOURCE_DIR}/build-support/build-lz4-lib.sh) +- endif() +- +- ExternalProject_Add(lz4_ep +- URL ${LZ4_SOURCE_URL} +- ${EP_LOG_OPTIONS} +- UPDATE_COMMAND "" +- ${LZ4_PATCH_COMMAND} +- CONFIGURE_COMMAND "" +- INSTALL_COMMAND "" +- BINARY_DIR ${LZ4_BUILD_DIR} +- BUILD_BYPRODUCTS ${LZ4_STATIC_LIB} +- ${LZ4_BUILD_COMMAND} +- ) +- +- set(LZ4_VENDORED 1) +- else() +- find_package(Lz4 REQUIRED) +- set(LZ4_VENDORED 0) +- endif() ++ find_package(Lz4 REQUIRED) ++ set(LZ4_VENDORED 0) + + include_directories(SYSTEM ${LZ4_INCLUDE_DIR}) + ADD_THIRDPARTY_LIB(lz4_static +@@ -1008,45 +652,8 @@ if (ARROW_WITH_ZSTD) + # ---------------------------------------------------------------------- + # ZSTD + +- if("${ZSTD_HOME}" STREQUAL "") +- set(ZSTD_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/zstd_ep-prefix/src/zstd_ep") +- set(ZSTD_INCLUDE_DIR "${ZSTD_BUILD_DIR}/lib") +- +- if (MSVC) +- if (ARROW_USE_STATIC_CRT) +- if (${UPPERCASE_BUILD_TYPE} STREQUAL "DEBUG") +- set(ZSTD_RUNTIME_LIBRARY_LINKAGE "/p:RuntimeLibrary=MultiThreadedDebug") +- else() +- set(ZSTD_RUNTIME_LIBRARY_LINKAGE "/p:RuntimeLibrary=MultiThreaded") +- endif() +- endif() +- set(ZSTD_STATIC_LIB "${ZSTD_BUILD_DIR}/build/VS2010/bin/x64_${CMAKE_BUILD_TYPE}/libzstd_static.lib") +- set(ZSTD_BUILD_COMMAND BUILD_COMMAND msbuild ${ZSTD_BUILD_DIR}/build/VS2010/zstd.sln /t:Build /v:minimal /p:Configuration=${CMAKE_BUILD_TYPE} +- ${ZSTD_RUNTIME_LIBRARY_LINKAGE} /p:Platform=x64 /p:PlatformToolset=v140 +- /p:OutDir=${ZSTD_BUILD_DIR}/build/VS2010/bin/x64_${CMAKE_BUILD_TYPE}/ /p:SolutionDir=${ZSTD_BUILD_DIR}/build/VS2010/ ) +- set(ZSTD_PATCH_COMMAND PATCH_COMMAND git --git-dir=. apply --verbose --whitespace=fix ${CMAKE_SOURCE_DIR}/build-support/zstd_msbuild_gl_runtimelibrary_params.patch) +- else() +- set(ZSTD_STATIC_LIB "${ZSTD_BUILD_DIR}/lib/libzstd.a") +- set(ZSTD_BUILD_COMMAND BUILD_COMMAND ${CMAKE_SOURCE_DIR}/build-support/build-zstd-lib.sh) +- endif() +- +- ExternalProject_Add(zstd_ep +- URL ${ZSTD_SOURCE_URL} +- ${EP_LOG_OPTIONS} +- UPDATE_COMMAND "" +- ${ZSTD_PATCH_COMMAND} +- CONFIGURE_COMMAND "" +- INSTALL_COMMAND "" +- BINARY_DIR ${ZSTD_BUILD_DIR} +- BUILD_BYPRODUCTS ${ZSTD_STATIC_LIB} +- ${ZSTD_BUILD_COMMAND} +- ) +- +- set(ZSTD_VENDORED 1) +- else() +- find_package(ZSTD REQUIRED) +- set(ZSTD_VENDORED 0) +- endif() ++ find_package(ZSTD REQUIRED) ++ set(ZSTD_VENDORED 0) + + include_directories(SYSTEM ${ZSTD_INCLUDE_DIR}) + ADD_THIRDPARTY_LIB(zstd_static +@@ -1063,24 +670,8 @@ endif() + + if (ARROW_ORC OR ARROW_FLIGHT) + # protobuf +- if ("${PROTOBUF_HOME}" STREQUAL "") +- set (PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install") +- set (PROTOBUF_HOME "${PROTOBUF_PREFIX}") +- set (PROTOBUF_INCLUDE_DIR "${PROTOBUF_PREFIX}/include") +- set (PROTOBUF_STATIC_LIB "${PROTOBUF_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}protobuf${CMAKE_STATIC_LIBRARY_SUFFIX}") +- +- ExternalProject_Add(protobuf_ep +- CONFIGURE_COMMAND "./configure" "--disable-shared" "--prefix=${PROTOBUF_PREFIX}" "CXXFLAGS=${EP_CXX_FLAGS}" +- BUILD_IN_SOURCE 1 +- URL ${PROTOBUF_SOURCE_URL} +- BUILD_BYPRODUCTS "${PROTOBUF_STATIC_LIB}" +- ${EP_LOG_OPTIONS}) +- +- set (PROTOBUF_VENDORED 1) +- else () +- find_package (Protobuf REQUIRED) +- set (PROTOBUF_VENDORED 0) +- endif () ++ find_package (Protobuf REQUIRED) ++ set (PROTOBUF_VENDORED 0) + + include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR}) + if (ARROW_PROTOBUF_USE_SHARED) +@@ -1100,34 +691,8 @@ endif() + # Dependencies for Arrow Flight RPC + + if (ARROW_FLIGHT) +- if ("${GRPC_HOME}" STREQUAL "") +- set(GRPC_VENDORED 1) +- set(GRPC_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/grpc_ep-prefix/src/grpc_ep-build") +- set(GRPC_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/grpc_ep/src/grpc_ep-install") +- set(GRPC_HOME "${GRPC_PREFIX}") +- set(GRPC_INCLUDE_DIR "${GRPC_PREFIX}/include") +- set(GRPC_STATIC_LIBRARY_GPR "${GRPC_BUILD_DIR}/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gpr${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(GRPC_STATIC_LIBRARY_GRPC "${GRPC_BUILD_DIR}/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}grpc${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(GRPC_STATIC_LIBRARY_GRPCPP "${GRPC_BUILD_DIR}/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}grpcpp${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(GRPC_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- "-DCMAKE_CXX_FLAGS=${EP_CXX_FLAGS}" +- "-DCMAKE_C_FLAGS=${EP_C_FLAGS}" +- -DCMAKE_INSTALL_PREFIX=${GRPC_PREFIX} +- -DBUILD_SHARED_LIBS=OFF) +- +- ExternalProject_Add(grpc_ep +- GIT_REPOSITORY "https://github.com/grpc/grpc" +- GIT_TAG ${GRPC_VERSION} +- BUILD_BYPRODUCTS "${GRPC_STATIC_LIBRARY_GPR}" "${GRPC_STATIC_LIBRARY_GRPC}" "${GRPC_STATIC_LIBRARY_GRPCPP}" +- ${GRPC_BUILD_BYPRODUCTS} +- ${EP_LOG_OPTIONS} +- CMAKE_ARGS ${GRPC_CMAKE_ARGS} +- ${EP_LOG_OPTIONS}) +- include_directories(SYSTEM ${GRPC_INCLUDE_DIR}) +- else() +- find_package(gRPC CONFIG REQUIRED) +- set(GRPC_VENDORED 0) +- endif() ++ find_package(gRPC CONFIG REQUIRED) ++ set(GRPC_VENDORED 0) + + get_property(GPR_STATIC_LIB TARGET gRPC::gpr PROPERTY LOCATION) + ADD_THIRDPARTY_LIB(grpc_gpr +@@ -1157,60 +722,9 @@ endif() + + if (ARROW_ORC) + # orc +- if ("${ORC_HOME}" STREQUAL "") +- set(ORC_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/orc_ep-install") +- set(ORC_HOME "${ORC_PREFIX}") +- set(ORC_INCLUDE_DIR "${ORC_PREFIX}/include") +- set(ORC_STATIC_LIB "${ORC_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}orc${CMAKE_STATIC_LIBRARY_SUFFIX}") +- +- if ("${COMPILER_FAMILY}" STREQUAL "clang") +- if ("${COMPILER_VERSION}" VERSION_GREATER "4.0") +- set(ORC_CMAKE_CXX_FLAGS " -Wno-zero-as-null-pointer-constant \ +- -Wno-inconsistent-missing-destructor-override ") +- endif() +- endif() +- +- set(ORC_CMAKE_CXX_FLAGS "${EP_CXX_FLAGS} ${ORC_CMAKE_CXX_FLAGS}") +- +- # Since LZ4 isn't installed, the header file is in ${LZ4_HOME}/lib instead of +- # ${LZ4_HOME}/include, which forces us to specify the include directory +- # manually as well. +- set (ORC_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- -DCMAKE_INSTALL_PREFIX=${ORC_PREFIX} +- -DCMAKE_CXX_FLAGS=${ORC_CMAKE_CXX_FLAGS} +- -DBUILD_LIBHDFSPP=OFF +- -DBUILD_JAVA=OFF +- -DBUILD_TOOLS=OFF +- -DBUILD_CPP_TESTS=OFF +- -DINSTALL_VENDORED_LIBS=OFF +- -DPROTOBUF_HOME=${PROTOBUF_HOME} +- -DLZ4_HOME=${LZ4_HOME} +- -DLZ4_INCLUDE_DIR=${LZ4_INCLUDE_DIR} +- -DSNAPPY_HOME=${SNAPPY_HOME} +- -DZLIB_HOME=${ZLIB_HOME}) +- +- ExternalProject_Add(orc_ep +- URL ${ORC_SOURCE_URL} +- BUILD_BYPRODUCTS ${ORC_STATIC_LIB} +- CMAKE_ARGS ${ORC_CMAKE_ARGS} +- ${EP_LOG_OPTIONS}) +- +- set(ORC_VENDORED 1) +- add_dependencies(orc_ep zlib) +- if (LZ4_VENDORED) +- add_dependencies(orc_ep lz4_static) +- endif() +- if (SNAPPY_VENDORED) +- add_dependencies(orc_ep snappy) +- endif() +- if (PROTOBUF_VENDORED) +- add_dependencies(orc_ep protobuf_ep) +- endif() +- else() +- set(ORC_INCLUDE_DIR "${ORC_HOME}/include") +- set(ORC_STATIC_LIB "${ORC_HOME}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}orc${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(ORC_VENDORED 0) +- endif() ++ set(ORC_INCLUDE_DIR "${ORC_HOME}/include") ++ set(ORC_STATIC_LIB "${ORC_HOME}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}orc${CMAKE_STATIC_LIBRARY_SUFFIX}") ++ set(ORC_VENDORED 0) + + include_directories(SYSTEM ${ORC_INCLUDE_DIR}) + ADD_THIRDPARTY_LIB(orc +@@ -1231,97 +745,7 @@ if (ARROW_WITH_THRIFT) + # find thrift headers and libs + find_package(Thrift) + +-if (NOT THRIFT_FOUND) +- set(THRIFT_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/thrift_ep/src/thrift_ep-install") +- set(THRIFT_HOME "${THRIFT_PREFIX}") +- set(THRIFT_INCLUDE_DIR "${THRIFT_PREFIX}/include") +- set(THRIFT_COMPILER "${THRIFT_PREFIX}/bin/thrift") +- set(THRIFT_CMAKE_ARGS "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" +- "-DCMAKE_CXX_FLAGS=${EP_CXX_FLAGS}" +- "-DCMAKE_C_FLAGS=${EP_C_FLAGS}" +- "-DCMAKE_INSTALL_PREFIX=${THRIFT_PREFIX}" +- "-DCMAKE_INSTALL_RPATH=${THRIFT_PREFIX}/lib" +- "-DBUILD_SHARED_LIBS=OFF" +- "-DBUILD_TESTING=OFF" +- "-DBUILD_EXAMPLES=OFF" +- "-DBUILD_TUTORIALS=OFF" +- "-DWITH_QT4=OFF" +- "-DWITH_C_GLIB=OFF" +- "-DWITH_JAVA=OFF" +- "-DWITH_PYTHON=OFF" +- "-DWITH_HASKELL=OFF" +- "-DWITH_CPP=ON" +- "-DWITH_STATIC_LIB=ON" +- "-DWITH_LIBEVENT=OFF" +- ) +- +- # Thrift also uses boost. Forward important boost settings if there were ones passed. +- if (DEFINED BOOST_ROOT) +- set(THRIFT_CMAKE_ARGS ${THRIFT_CMAKE_ARGS} "-DBOOST_ROOT=${BOOST_ROOT}") +- endif() +- if (DEFINED Boost_NAMESPACE) +- set(THRIFT_CMAKE_ARGS ${THRIFT_CMAKE_ARGS} "-DBoost_NAMESPACE=${Boost_NAMESPACE}") +- endif() +- +- set(THRIFT_STATIC_LIB_NAME "${CMAKE_STATIC_LIBRARY_PREFIX}thrift") +- if (MSVC) +- if (ARROW_USE_STATIC_CRT) +- set(THRIFT_STATIC_LIB_NAME "${THRIFT_STATIC_LIB_NAME}mt") +- set(THRIFT_CMAKE_ARGS ${THRIFT_CMAKE_ARGS} "-DWITH_MT=ON") +- else() +- set(THRIFT_STATIC_LIB_NAME "${THRIFT_STATIC_LIB_NAME}md") +- set(THRIFT_CMAKE_ARGS ${THRIFT_CMAKE_ARGS} "-DWITH_MT=OFF") +- endif() +- endif() +- if (${UPPERCASE_BUILD_TYPE} STREQUAL "DEBUG") +- set(THRIFT_STATIC_LIB_NAME "${THRIFT_STATIC_LIB_NAME}d") +- endif() +- set(THRIFT_STATIC_LIB "${THRIFT_PREFIX}/lib/${THRIFT_STATIC_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}") +- +- if (ZLIB_SHARED_LIB) +- set(THRIFT_CMAKE_ARGS "-DZLIB_LIBRARY=${ZLIB_SHARED_LIB}" +- ${THRIFT_CMAKE_ARGS}) +- else() +- set(THRIFT_CMAKE_ARGS "-DZLIB_LIBRARY=${ZLIB_STATIC_LIB}" +- ${THRIFT_CMAKE_ARGS}) +- endif() +- set(THRIFT_DEPENDENCIES ${THRIFT_DEPENDENCIES} zlib) +- +- if (MSVC) +- set(WINFLEXBISON_VERSION 2.4.9) +- set(WINFLEXBISON_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/winflexbison_ep/src/winflexbison_ep-install") +- ExternalProject_Add(winflexbison_ep +- URL https://github.com/lexxmark/winflexbison/releases/download/v.${WINFLEXBISON_VERSION}/win_flex_bison-${WINFLEXBISON_VERSION}.zip +- URL_HASH MD5=a2e979ea9928fbf8567e995e9c0df765 +- SOURCE_DIR ${WINFLEXBISON_PREFIX} +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- INSTALL_COMMAND "" +- ${EP_LOG_OPTIONS}) +- set(THRIFT_DEPENDENCIES ${THRIFT_DEPENDENCIES} winflexbison_ep) +- +- set(THRIFT_CMAKE_ARGS "-DFLEX_EXECUTABLE=${WINFLEXBISON_PREFIX}/win_flex.exe" +- "-DBISON_EXECUTABLE=${WINFLEXBISON_PREFIX}/win_bison.exe" +- "-DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIR}" +- "-DWITH_SHARED_LIB=OFF" +- "-DWITH_PLUGIN=OFF" +- ${THRIFT_CMAKE_ARGS}) +- elseif (APPLE) +- if (DEFINED BISON_EXECUTABLE) +- set(THRIFT_CMAKE_ARGS "-DBISON_EXECUTABLE=${BISON_EXECUTABLE}" +- ${THRIFT_CMAKE_ARGS}) +- endif() +- endif() +- +- ExternalProject_Add(thrift_ep +- URL ${THRIFT_SOURCE_URL} +- BUILD_BYPRODUCTS "${THRIFT_STATIC_LIB}" "${THRIFT_COMPILER}" +- CMAKE_ARGS ${THRIFT_CMAKE_ARGS} +- DEPENDS ${THRIFT_DEPENDENCIES} +- ${EP_LOG_OPTIONS}) +- +- set(THRIFT_VENDORED 1) +-else() ++if (THRIFT_FOUND) + set(THRIFT_VENDORED 0) + endif() + +@@ -1347,45 +771,8 @@ endif() # ARROW_HIVESERVER2 + # GLOG + + if (ARROW_USE_GLOG) +- if("${GLOG_HOME}" STREQUAL "") +- set(GLOG_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/glog_ep-prefix/src/glog_ep") +- set(GLOG_INCLUDE_DIR "${GLOG_BUILD_DIR}/include") +- set(GLOG_STATIC_LIB "${GLOG_BUILD_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}glog${CMAKE_STATIC_LIBRARY_SUFFIX}") +- set(GLOG_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") +- set(GLOG_CMAKE_C_FLAGS "${EP_C_FLAGS} -fPIC") +- if (PTHREAD_LIBRARY) +- set(GLOG_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -pthread") +- set(GLOG_CMAKE_C_FLAGS "${EP_C_FLAGS} -fPIC -pthread") +- endif() +- message(STATUS "GLOG_CMAKE_CXX_FLAGS: ${GLOG_CMAKE_CXX_FLAGS}") +- message(STATUS "CMAKE_CXX_FLAGS in glog: ${GLOG_CMAKE_CXX_FLAGS}") +- +- if(APPLE) +- # If we don't set this flag, the binary built with 10.13 cannot be used in 10.12. +- set(GLOG_CMAKE_CXX_FLAGS "${GLOG_CMAKE_CXX_FLAGS} -mmacosx-version-min=10.9") +- endif() +- +- set(GLOG_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- -DCMAKE_INSTALL_PREFIX=${GLOG_BUILD_DIR} +- -DBUILD_SHARED_LIBS=OFF +- -DBUILD_TESTING=OFF +- -DWITH_GFLAGS=OFF +- -DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${GLOG_CMAKE_CXX_FLAGS} +- -DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${GLOG_CMAKE_C_FLAGS} +- -DCMAKE_CXX_FLAGS=${GLOG_CMAKE_CXX_FLAGS}) +- message(STATUS "Glog version: ${GLOG_VERSION}") +- ExternalProject_Add(glog_ep +- URL ${GLOG_SOURCE_URL} +- BUILD_IN_SOURCE 1 +- BUILD_BYPRODUCTS "${GLOG_STATIC_LIB}" +- CMAKE_ARGS ${GLOG_CMAKE_ARGS} +- ${EP_LOG_OPTIONS}) +- +- set(GLOG_VENDORED 1) +- else() +- find_package(GLOG REQUIRED) +- set(GLOG_VENDORED 0) +- endif() ++ find_package(GLOG REQUIRED) ++ set(GLOG_VENDORED 0) + + message(STATUS "Glog include dir: ${GLOG_INCLUDE_DIR}") + message(STATUS "Glog static library: ${GLOG_STATIC_LIB}") diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 4bd745ebf..73cf90eb2 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -7,15 +7,15 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/arrow - REF apache-arrow-0.9.0 - SHA512 789d0948eee3af20eb922e09c14eb721f20fa041ca3c0cf57bd869718fc9919b45590bd72714efafdf19196f35abb6bdbe0a3972ca74fcc2af92c1f9ade8fa00 + REF apache-arrow-0.11.1 + SHA512 8a2de7e4b40666e4ea7818fac488549f1348e961e7cb6a4166ae4019976a574fd115dc1cabaf44bc1cbaabf15fb8e5133c8232b34fca250d8ff7c5b65c5407c8 HEAD_REF master ) set(CPP_SOURCE_PATH "${SOURCE_PATH}/cpp") vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH ${CPP_SOURCE_PATH} PATCHES "${CMAKE_CURRENT_LIST_DIR}/all.patch" ) @@ -23,6 +23,14 @@ vcpkg_apply_patches( string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" ARROW_BUILD_SHARED) string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" ARROW_BUILD_STATIC) +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" IS_STATIC) + +if (IS_STATIC) + set(PARQUET_ARROW_LINKAGE static) +else() + set(PARQUET_ARROW_LINKAGE shared) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${CPP_SOURCE_PATH} PREFER_NINJA @@ -38,18 +46,28 @@ vcpkg_configure_cmake( -DBOOST_ROOT=${CURRENT_INSTALLED_DIR} -DGFLAGS_HOME=${CURRENT_INSTALLED_DIR} -DZLIB_HOME=${CURRENT_INSTALLED_DIR} + -DARROW_PARQUET=ON -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC} -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED} + -DBUILD_STATIC=${ARROW_BUILD_STATIC} + -DBUILD_SHARED=${ARROW_BUILD_SHARED} + -DPARQUET_ARROW_LINKAGE=${PARQUET_ARROW_LINKAGE} + -DDOUBLE_CONVERSION_HOME=${CURRENT_INSTALLED_DIR} + -DGLOG_HOME=${CURRENT_INSTALLED_DIR} ) vcpkg_install_cmake() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/lib/arrow.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/arrow.lib) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) -else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/arrow_static.lib) +vcpkg_copy_pdbs() + +if(WIN32) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/lib/arrow.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/arrow.lib) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) + else() + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/arrow_static.lib) + endif() endif() file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/arrow RENAME copyright) diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL index 51efe3f6f..2ca540258 100644 --- a/ports/azure-c-shared-utility/CONTROL +++ b/ports/azure-c-shared-utility/CONTROL @@ -2,3 +2,6 @@ Source: azure-c-shared-utility Version: 1.1.11-3 Description: Azure C SDKs common code Build-Depends: curl (linux), openssl (linux) + +Feature: public-preview +Description: Azure C SDKs common code (public preview) diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index cc4514dfe..408c996db 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -2,14 +2,25 @@ include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-c-shared-utility - REF 1d622902d7842f94193fc394987f2b4e978bb700 - SHA512 e7b3671955aeefe8e748bc68dd9f914fbb86c9cf325606691efc332cffa0d80b61f87d5f5c1026676c35fd1c5e88f22ca60f2e811c351aeba659f810fdc52e84 - HEAD_REF master - PATCHES no-double-expand-cmake.patch -) +if("public-preview" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-c-shared-utility + REF e885482ce32f1f77d29e85f7b8d35d74ffc69c74 + SHA512 329101cb2ff499aa16e1df736285e2fdd8c34549d4790eaafa1df763950c2b4a5927f52e93dbf22192b240fe0445050ad99133df0405227ffe9857ff2b25014d + HEAD_REF public-preview + PATCHES no-double-expand-cmake.patch + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-c-shared-utility + REF 1d622902d7842f94193fc394987f2b4e978bb700 + SHA512 e7b3671955aeefe8e748bc68dd9f914fbb86c9cf325606691efc332cffa0d80b61f87d5f5c1026676c35fd1c5e88f22ca60f2e811c351aeba659f810fdc52e84 + HEAD_REF master + PATCHES no-double-expand-cmake.patch + ) +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index 0164d44a0..139e72eb1 100644 --- a/ports/azure-iot-sdk-c/CONTROL +++ b/ports/azure-iot-sdk-c/CONTROL @@ -2,3 +2,7 @@ Source: azure-iot-sdk-c Version: 1.2.12-1 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson Description: A C99 SDK for connecting devices to Microsoft Azure IoT services + +Feature: public-preview +Description: A version of the azure-iot-sdk-c containing public-preview features. +Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview] diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 2b1ef492c..6008b0e71 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -2,14 +2,25 @@ include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-iot-sdk-c - REF 350b51f5abaedc975dae5419ad1fa4add7635fd2 - SHA512 7559768f7d1c67f6b28d16871c3c783e9f88d9dc4f9051a7a3c0329311d39821301edf64fcbde15a8e904c6d5a6326feee25be8e46cb657c21455ae920b266eb - HEAD_REF master - PATCHES improve-external-deps.patch -) +if("public-preview" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-iot-sdk-c + REF 74b03316ec90f1602c20ebeab67a3b4a61065d8e + SHA512 78ab8d7cd6e25886e41f98500cb8cd9609ca677426a882ed0364a908e5267ec6191bb15fd65fb2c420a108df41f52a8ba6d5e6d626874bbfae4f56e8af5ca428 + HEAD_REF public-preview + PATCHES improve-external-deps.patch + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-iot-sdk-c + REF 350b51f5abaedc975dae5419ad1fa4add7635fd2 + SHA512 7559768f7d1c67f6b28d16871c3c783e9f88d9dc4f9051a7a3c0329311d39821301edf64fcbde15a8e904c6d5a6326feee25be8e46cb657c21455ae920b266eb + HEAD_REF master + PATCHES improve-external-deps.patch + ) +endif() file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/) diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL index 062c02bef..a903752ac 100644 --- a/ports/azure-uamqp-c/CONTROL +++ b/ports/azure-uamqp-c/CONTROL @@ -2,3 +2,7 @@ Source: azure-uamqp-c Version: 1.2.11-2 Build-Depends: azure-c-shared-utility Description: AMQP library for C + +Feature: public-preview +Description: AMQP library for C (public preview) +Build-Depends: azure-c-shared-utility[public-preview] diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake index b7ee41625..4f4d33ee9 100644 --- a/ports/azure-uamqp-c/portfile.cmake +++ b/ports/azure-uamqp-c/portfile.cmake @@ -2,13 +2,23 @@ include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-uamqp-c - REF f29401ab5eb3853390d5f573d8fb37c0c96dba16 - SHA512 8fdee32e2a85218257ee91754873f9f8ae5e16cd2b7b10c88ab6d4115fe4378a2b08f211d8307346b0bd7688c4c896c25a4de34e9231c2506819a97bbf46dd73 - HEAD_REF master -) +if("public-preview" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-uamqp-c + REF bd7b85d0830634e3157da2411a6d060bf28f266e + SHA512 cbc2aa2765242ebe1a5e194e126f419cbd26edda5c1f72ffe9219a6c38b80aa91ef823a4fd8f78ac5d7ae0d9d471b50e5b8c4684e77c71b31e7cf35802e0cc17 + HEAD_REF public-preview + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-uamqp-c + REF f29401ab5eb3853390d5f573d8fb37c0c96dba16 + SHA512 8fdee32e2a85218257ee91754873f9f8ae5e16cd2b7b10c88ab6d4115fe4378a2b08f211d8307346b0bd7688c4c896c25a4de34e9231c2506819a97bbf46dd73 + HEAD_REF master + ) +endif() file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/) diff --git a/ports/azure-uhttp-c/CONTROL b/ports/azure-uhttp-c/CONTROL index e41543687..8a6857c3e 100644 --- a/ports/azure-uhttp-c/CONTROL +++ b/ports/azure-uhttp-c/CONTROL @@ -2,3 +2,7 @@ Source: azure-uhttp-c Version: 1.1.11-2 Build-Depends: azure-c-shared-utility Description: Azure HTTP Library written in C + +Feature: public-preview +Description: Azure HTTP Library written in C (public preview) +Build-Depends: azure-c-shared-utility[public-preview] diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake index 64834510d..0ef272a12 100644 --- a/ports/azure-uhttp-c/portfile.cmake +++ b/ports/azure-uhttp-c/portfile.cmake @@ -2,13 +2,23 @@ include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-uhttp-c - REF 647ec7cc75961cd7ff7cbb7eca30e1de819802ed - SHA512 1768ea978ab7fa328b74444573c3d1eb2a5fae1e36dbe1dcc186df3e2ab2a0a3b1ba8a434934462184582525b3a1850fc04ca2927f95f0df0ae483f8a1673e30 - HEAD_REF master -) +if("public-preview" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-uhttp-c + REF e459385a811ce075f42aa7202db96ba1d1f55ac1 + SHA512 b96382184893b49f30ad75d4c19eeb48f7a7823e9d48f2896ee4760be20f2f5b5ee3e78e39f10ae26363165360e5871c3ba82aa9edf3943b9f0ef9c0e3036ea6 + HEAD_REF public-preview + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-uhttp-c + REF 647ec7cc75961cd7ff7cbb7eca30e1de819802ed + SHA512 1768ea978ab7fa328b74444573c3d1eb2a5fae1e36dbe1dcc186df3e2ab2a0a3b1ba8a434934462184582525b3a1850fc04ca2927f95f0df0ae483f8a1673e30 + HEAD_REF master + ) +endif() file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/) diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL index 407844601..84359ff0c 100644 --- a/ports/azure-umqtt-c/CONTROL +++ b/ports/azure-umqtt-c/CONTROL @@ -2,3 +2,7 @@ Source: azure-umqtt-c Version: 1.1.11-2 Build-Depends: azure-c-shared-utility Description: General purpose library for communication over the mqtt protocol + +Feature: public-preview +Description: General purpose library for communication over the mqtt protocol (public preview) +Build-Depends: azure-c-shared-utility[public-preview] diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index 6bfb77f89..d03c24527 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -2,13 +2,23 @@ include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Azure/azure-umqtt-c - REF 3205eb26401e9c6639100934e8fb75b75275760d - SHA512 002c0d4f0373faeb7171465afce268f18b52d80ec057af36c81dd807de8ccf2bf1a46ef00c7f8e8fcdbef8d7f5c36616a304007c98ea5700c5f662b4c8868c2c - HEAD_REF master -) +if("public-preview" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-umqtt-c + REF 1b3a25f4f7f0edbe068e261e8a808d7bc394a358 + SHA512 00ff90eccfbb4febded7e819baa6303e97d3e7d6f6f8f1a28ebf353d7ad7ac5ec7f479e66456f395c7ece7fd6d612f3948ac656420bc0bc75566bdbb65fb88c3 + HEAD_REF public-preview + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-umqtt-c + REF 3205eb26401e9c6639100934e8fb75b75275760d + SHA512 002c0d4f0373faeb7171465afce268f18b52d80ec057af36c81dd807de8ccf2bf1a46ef00c7f8e8fcdbef8d7f5c36616a304007c98ea5700c5f662b4c8868c2c + HEAD_REF master + ) +endif() file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/) diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL index 5e51572cc..fcdc0fcaa 100644 --- a/ports/cppgraphqlgen/CONTROL +++ b/ports/cppgraphqlgen/CONTROL @@ -1,4 +1,4 @@ Source: cppgraphqlgen
-Version: 1.0.0
+Version: 1.0.3
Build-Depends: pegtl, rapidjson
Description: C++ GraphQL schema service generator
diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index 926a4ecd2..c6cad7d99 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/cppgraphqlgen
- REF v1.0.0
- SHA512 3756c31063dc86d1c37d3cb709221b2b6e7dda5f3405d7586e4f395fd4915b1088c0305b116164c615846413042857fd688e61ef36c5c2aab218cfab8f16370c
+ REF v1.0.3
+ SHA512 136f17460d6a7ed3bd20e2be5f9326d2a4a039bc1a7a212155a31a5e165e0f1fd061638c3f77f22d6c3d4230e9a57563585ad29ef59eea355e1521b374ce1ce4
HEAD_REF master
)
diff --git a/ports/easyloggingpp/CONTROL b/ports/easyloggingpp/CONTROL index 3f462dfbd..9e2427ff9 100644 --- a/ports/easyloggingpp/CONTROL +++ b/ports/easyloggingpp/CONTROL @@ -1,3 +1,3 @@ Source: easyloggingpp
-Version: 9.96.5-1
+Version: 9.96.7
Description: Easylogging++ is a single header efficient logging library for C++ applications.
\ No newline at end of file diff --git a/ports/easyloggingpp/portfile.cmake b/ports/easyloggingpp/portfile.cmake index ecb678746..8294e0a81 100644 --- a/ports/easyloggingpp/portfile.cmake +++ b/ports/easyloggingpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO muflihun/easyloggingpp
- REF v9.96.5
- SHA512 51493693095df03f8772174a8ec4fc681832319bd723224a544539efdcf73c7653d3973ec0ae0cd004e496bf98c105c278e4a72694ebf34b207c658b3225a87b
+ REF v9.96.7
+ SHA512 53ee637cd7462fac542170a81a9a206f3418dd8bc9e1f25d1d13dadef630e0fdf2880d71079808ebc49d36a7dbca7b5cdb76ad37b722c66b4b3d3efc8b5d2f35
HEAD_REF master
)
diff --git a/ports/ecm/CONTROL b/ports/ecm/CONTROL index 6076cf714..610344134 100644 --- a/ports/ecm/CONTROL +++ b/ports/ecm/CONTROL @@ -1,3 +1,3 @@ Source: ecm -Version: 5.50.0 +Version: 5.53.0 Description: Extra CMake Modules (ECM), extra modules and scripts for CMake diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake index 325a6505c..27cbddc53 100644 --- a/ports/ecm/portfile.cmake +++ b/ports/ecm/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/extra-cmake-modules - REF v5.50.0 - SHA512 625f934b97c56cceed44d8fa0e335fb1f593806e52b8bfd2fd467561b4de2528940add756a8e903bd5502e912422cc3835e65e047cc4c205d3b8629452627abd + REF v5.53.0 + SHA512 147dea1c8b3b0f01fca4330fa4200a0f67c1a21a999979c94669459e347c8292cd94cb18d431d55883fff9d6acd5820428de500fc3cd790aa9f17d54bceeadc3 HEAD_REF master ) diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 35b3e257e..ce69402dc 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,5 +1,5 @@ Source: ffmpeg -Version: 4.1 +Version: 4.1-1 Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations. diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL index 14306b730..7a82286dd 100644 --- a/ports/fmt/CONTROL +++ b/ports/fmt/CONTROL @@ -1,3 +1,3 @@ Source: fmt -Version: 5.2.1 +Version: 5.3.0 Description: Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams. diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index a12f66c39..d36efcadc 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt - REF 5.2.1 - SHA512 2b63a741df4df9c3cbf04098c6548bb3d0f9836fe912325542298df57c888f43e72159469fb87685b423694e43e4418545377d5ee6393f2709955be2c13780a8 + REF 5.3.0 + SHA512 9ef0f3d328681253c1e1776576d54d67dec49c19fd7fc422ae63c3610b01a3f05f6e83cdf5e913dfd09bac42e52fe35c38ebe1ea91f4207d226a32aaf69eb4a8 HEAD_REF master ) diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake index 7f0b6bc12..2a26817d7 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -8,7 +8,7 @@ endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gettext-0.19) vcpkg_download_distfile(ARCHIVE - URLS "http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.tar.gz" + URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-0.19.tar.gz" FILENAME "gettext-0.19.tar.gz" SHA512 a5db035c582ff49d45ee6eab9466b2bef918e413a882019c204a9d8903cb3770ddfecd32c971ea7c7b037c7b69476cf7c56dcabc8b498b94ab99f132516c9922 ) diff --git a/ports/icu/CONTROL b/ports/icu/CONTROL index 0cb924a2a..171eb1129 100644 --- a/ports/icu/CONTROL +++ b/ports/icu/CONTROL @@ -1,3 +1,3 @@ Source: icu
-Version: 61.1-4
+Version: 61.1-5
Description: Mature and widely used Unicode and localization library.
diff --git a/ports/imgui/CONTROL b/ports/imgui/CONTROL index 46d927c9e..376a3a103 100644 --- a/ports/imgui/CONTROL +++ b/ports/imgui/CONTROL @@ -1,3 +1,3 @@ Source: imgui -Version: 1.66b +Version: 1.67-1 Description: Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies. diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index 756574d76..e5aaa471c 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF v1.66b - SHA512 894339a70f99c517d9306c49d861a43710b936e71067ddd322f5e771396f8e658a541111fcb00ce9010599f0ec9702d029d18b155199c7635129fd659ac13dbc + REF v1.67 + SHA512 14cca66a55597517d6e1cafa59897b8e8f482db0a31a73d87a3ca634a12afe9ece2f423c17ece802e23bb2c09322502b2b2c4318054fad03bd1c537031fd6f71 HEAD_REF master ) diff --git a/ports/libass/CONTROL b/ports/libass/CONTROL new file mode 100644 index 000000000..0142a5e51 --- /dev/null +++ b/ports/libass/CONTROL @@ -0,0 +1,3 @@ +Source: libass +Version: 0.14.0 +Description: libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format. diff --git a/ports/libass/portfile.cmake b/ports/libass/portfile.cmake new file mode 100644 index 000000000..a7380a6e6 --- /dev/null +++ b/ports/libass/portfile.cmake @@ -0,0 +1,15 @@ +#header-only library +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libass/libass + REF 98727c3b78f44cb3bbc955fcf5d977ebd911d5ca + SHA512 d466108180cea598b817f89aa21a1021ed2a763580d9aad51b054aa120186af48ab4264907e49ddcb38479a28d87d5431751a28afee9cb83ad7623f002d99c57 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/libass/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libass RENAME copyright)
\ No newline at end of file diff --git a/ports/libgd/CONTROL b/ports/libgd/CONTROL index a8373f515..d9eb37c75 100644 --- a/ports/libgd/CONTROL +++ b/ports/libgd/CONTROL @@ -1,4 +1,4 @@ Source: libgd -Version: 2.2.4-4 +Version: 2.2.4-5 Description: Open source code library for the dynamic creation of images by programmers. Build-Depends: freetype, libjpeg-turbo, libpng, libwebp, tiff, fontconfig diff --git a/ports/libidn2/CONTROL b/ports/libidn2/CONTROL index 46e81c7bf..2fc289034 100644 --- a/ports/libidn2/CONTROL +++ b/ports/libidn2/CONTROL @@ -1,4 +1,4 @@ Source: libidn2 -Version: 2.0.4 +Version: 2.0.5-1 Build-Depends: libiconv Description: GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names. diff --git a/ports/libidn2/config.h b/ports/libidn2/config.h index 9e61bc8f2..5d5e6efcc 100644 --- a/ports/libidn2/config.h +++ b/ports/libidn2/config.h @@ -670,7 +670,7 @@ /* #undef PACKAGE_PACKAGER_VERSION */ /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libidn2 2.0.4" +#define PACKAGE_STRING "libidn2 @IDN2_VERSION@" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libidn2" @@ -679,7 +679,7 @@ #define PACKAGE_URL "https://www.gnu.org/software/libidn/#libidn2" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.0.4" +#define PACKAGE_VERSION "@IDN2_VERSION@" /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 'ptrdiff_t'. */ @@ -771,7 +771,7 @@ /* Version number of package */ -#define VERSION "2.0.4" +#define VERSION "@IDN2_VERSION@" /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 'wchar_t'. */ diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake index 98892e2c0..85cc9e6ce 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -1,21 +1,25 @@ include(vcpkg_common_functions) -set(IDN2_VERSION 2.0.4) +set(IDN2_VERSION 2.0.5) set(IDN2_FILENAME libidn2-${IDN2_VERSION}.tar.gz) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libidn2-${IDN2_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "http://ftp.gnu.org/gnu/libidn/${IDN2_FILENAME}" FILENAME "${IDN2_FILENAME}" - SHA512 1e51bd4b8f8907531576291f1c2a8865d17429b4105418b4c98754eb982cd1cbb3adbeab4ec0c1c561d2dba11d876c7c09e5dc5b315c55a2c24986d7a2a3b4d2 + SHA512 9d040d60de40316788825d8720d509d5b8a82287415e09e17792c2f32fad99ca77f43e55888b9484db69426eaa0ece59e9671eee9cc46411afbdb0f81af31a79 ) -vcpkg_extract_source_archive(${ARCHIVE}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${IDN2_VERSION} +) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/string.h DESTINATION ${SOURCE_PATH}/gl) +configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h ${SOURCE_PATH}) + function(simple_copy_template_header FILE_PATH BASE_NAME) if(NOT EXISTS ${FILE_PATH}/${BASE_NAME}.h) if(EXISTS ${FILE_PATH}/${BASE_NAME}.in.h) diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL index fa72d68b0..88f6e689a 100644 --- a/ports/libjpeg-turbo/CONTROL +++ b/ports/libjpeg-turbo/CONTROL @@ -1,3 +1,3 @@ Source: libjpeg-turbo -Version: 1.5.3-1 +Version: 1.5.3-2 Description: libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems. diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index c077fd16c..002818c47 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -51,11 +51,14 @@ vcpkg_configure_cmake( vcpkg_install_cmake() # Rename libraries for static builds -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND EXISTS "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib") +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/jpeg.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/turbojpeg.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib") +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib") endif() file(COPY diff --git a/ports/libmupdf/CONTROL b/ports/libmupdf/CONTROL index 36ae69488..df04d00a2 100644 --- a/ports/libmupdf/CONTROL +++ b/ports/libmupdf/CONTROL @@ -1,4 +1,4 @@ Source: libmupdf -Version: 1.12.0 +Version: 1.12.0-1 Build-Depends: freetype, libjpeg-turbo, harfbuzz, zlib, curl, glfw3, openjpeg, jbig2dec Description: a lightweight PDF, XPS, and E-book library diff --git a/ports/libmupdf/Fix-error-C2169.patch b/ports/libmupdf/Fix-error-C2169.patch new file mode 100644 index 000000000..164ffe157 --- /dev/null +++ b/ports/libmupdf/Fix-error-C2169.patch @@ -0,0 +1,12 @@ +diff --git a/include/mupdf/fitz/system.h b/include/mupdf/fitz/system.h
+index 0552771..42fd037 100644
+--- a/include/mupdf/fitz/system.h
++++ b/include/mupdf/fitz/system.h
+@@ -117,7 +117,6 @@ static __inline int signbit(double x)
+ #define isinf(x) (!_finite(x))
+ #endif
+
+-#define hypotf _hypotf
+ #define atoll _atoi64
+
+ char *fz_utf8_from_wchar(const wchar_t *s);
diff --git a/ports/libmupdf/portfile.cmake b/ports/libmupdf/portfile.cmake index b3618ea80..2af2327cc 100644 --- a/ports/libmupdf/portfile.cmake +++ b/ports/libmupdf/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 1.12.0 SHA512 893a1958e34355acf73624e9c47f4a97adf13d5fe33604ac384df9ac22a56ef7c18e02143eaffc3c2a08f460e4c71fee00c094b6d6696f8446977bb18f65e3da HEAD_REF master + PATCHES + "${CURRENT_PORT_DIR}/Fix-error-C2169.patch" ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/libvpx/CONTROL b/ports/libvpx/CONTROL index fa1522629..77a44f195 100644 --- a/ports/libvpx/CONTROL +++ b/ports/libvpx/CONTROL @@ -1,3 +1,3 @@ Source: libvpx -Version: 1.7.0 +Version: 1.7.0-1 Description: The reference software implementation for the video coding formats VP8 and VP9. diff --git a/ports/milerius-sfml-imgui/CONTROL b/ports/milerius-sfml-imgui/CONTROL index a9f8e9096..88eb539ef 100644 --- a/ports/milerius-sfml-imgui/CONTROL +++ b/ports/milerius-sfml-imgui/CONTROL @@ -1,4 +1,4 @@ Source: milerius-sfml-imgui
-Version: 1.1
+Version: 1.1-1
Description: imgui dll for sfml usage
Build-Depends: sfml (windows), imgui
diff --git a/ports/milerius-sfml-imgui/portfile.cmake b/ports/milerius-sfml-imgui/portfile.cmake index 1520d5e35..d4975da15 100644 --- a/ports/milerius-sfml-imgui/portfile.cmake +++ b/ports/milerius-sfml-imgui/portfile.cmake @@ -20,5 +20,5 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sfml-imgui) vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sfml-imgui)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/sfml-imgui/LICENSE ${CURRENT_PACKAGES_DIR}/share/sfml-imgui/copyright)
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui/LICENSE ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui/copyright)
diff --git a/ports/minizip/minizip.patch b/ports/minizip/minizip.patch new file mode 100644 index 000000000..04ef8fa2f --- /dev/null +++ b/ports/minizip/minizip.patch @@ -0,0 +1,16 @@ +diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
+index f12e3329..bfc05f77 100644
+--- a/contrib/minizip/unzip.c
++++ b/contrib/minizip/unzip.c
+@@ -68,10 +68,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+
+-#ifndef NOUNCRYPT
+- #define NOUNCRYPT
+-#endif
+-
+ #include "zlib.h"
+ #include "unzip.h"
+
+
diff --git a/ports/minizip/portfile.cmake b/ports/minizip/portfile.cmake index f12e3329b..927951d70 100644 --- a/ports/minizip/portfile.cmake +++ b/ports/minizip/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( REF v1.2.11 SHA512 104c62ed1228b5f1199bc037081861576900eb0697a226cafa62a35c4c890b5cb46622e399f9aad82ee5dfb475bae26ae75e2bd6da3d261361b1c8b996970faf HEAD_REF master + PATCHES minizip.patch # enable decrypt support for password-encrypted ZIP files ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/ms-gsl/CONTROL b/ports/ms-gsl/CONTROL index c782ee097..b17888fd3 100644 --- a/ports/ms-gsl/CONTROL +++ b/ports/ms-gsl/CONTROL @@ -1,3 +1,3 @@ Source: ms-gsl -Version: 2018-12-14 -Description: Microsoft implementation of the Guidelines Support Library
\ No newline at end of file +Version: 2019-01-15 +Description: Microsoft implementation of the Guidelines Support Library diff --git a/ports/ms-gsl/portfile.cmake b/ports/ms-gsl/portfile.cmake index 1b0711977..a1359d206 100644 --- a/ports/ms-gsl/portfile.cmake +++ b/ports/ms-gsl/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/GSL - REF 0f68d133fa6fd2973951b8aaab481e34bbfd2cf4 - SHA512 1aa8116a75dd6ffd3a879dcf52f804e1d67e03bac3788559441ddebe2db6fd43a362bfa5ddac36954848555ba1e7fccb2d26b6060a9e171a04497ea551402b42 + REF 6418b5f4de2204cd5a335b00d2f8754301b8b382 + SHA512 d585ce18ff190e681f55c53978bd8d84dd0f8ebf0f572a49a38be07c44bd97b6d99c46b9f5fff2455dbd934e242be4a2d6d3ca2ba193358cafa14272d7a6fba8 HEAD_REF master ) diff --git a/ports/msmpi/CONTROL b/ports/msmpi/CONTROL index 27e27074a..7a4b2d62e 100644 --- a/ports/msmpi/CONTROL +++ b/ports/msmpi/CONTROL @@ -1,3 +1,3 @@ Source: msmpi -Version: 9.0 +Version: 10.0 Description: Microsoft MPI diff --git a/ports/msmpi/portfile.cmake b/ports/msmpi/portfile.cmake index 7933f2361..70c2ff5d9 100644 --- a/ports/msmpi/portfile.cmake +++ b/ports/msmpi/portfile.cmake @@ -1,17 +1,19 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/msmpi-8.1) + +set(MSMPI_VERSION "10.0.12498") +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/msmpi-${MSMPI_VERSION}) vcpkg_download_distfile(SDK_ARCHIVE - URLS "https://download.microsoft.com/download/2/E/C/2EC96D7F-687B-4613-80F6-E10F670A2D97/msmpisdk.msi" - FILENAME "msmpisdk-9.0.msi" - SHA512 f80cc7619c42a5a0975224c5a0ab6d4085a97ab9a1480318cd72db2f600db52fb81d3959a2a9e0dbd9412b02d0814b8191dd4745bbde397110210e05960628b4 + URLS "https://download.microsoft.com/download/A/E/0/AE002626-9D9D-448D-8197-1EA510E297CE/msmpisdk.msi" + FILENAME "msmpisdk-${MSMPI_VERSION}.msi" + SHA512 36a31b2516f45fbc26167b31d2d6419f1928aef1591033f0430d36570159205e1a3134557a4ac0462f2d879add1fc6fee87a6997032e4438b528cd42a8bbe6b1 ) macro(download_msmpi_redistributable_package) vcpkg_download_distfile(REDIST_ARCHIVE - URLS "https://download.microsoft.com/download/2/E/C/2EC96D7F-687B-4613-80F6-E10F670A2D97/msmpisetup.exe" - FILENAME "msmpisetup-9.0.exe" - SHA512 ad1cc3bc74e4c9c3c0f304395df9468e729e0acd9c77c8c6c806e88eadf4693811d29e608ffb459fcb6f4a20f61946ef4ac2e411aac49fb8f8d5aaddd10d4554 + URLS "https://download.microsoft.com/download/A/E/0/AE002626-9D9D-448D-8197-1EA510E297CE/msmpisetup.exe" + FILENAME "msmpisetup-${MSMPI_VERSION}.exe" + SHA512 c272dc842eb1e693f25eb580e1caf0c1fdb385611a12c20cdc6a40cf592ccbdba434a1c16edb63eef14b1a2ac6e678ac1cd561ec5fd003a5d17191a0fad281ae ) endmacro() @@ -20,7 +22,6 @@ endmacro() # We always want the ProgramFiles folder even on a 64-bit machine (not the ProgramFilesx86 folder) vcpkg_get_program_files_platform_bitness(PROGRAM_FILES_PLATFORM_BITNESS) set(SYSTEM_MPIEXEC_FILEPATH "${PROGRAM_FILES_PLATFORM_BITNESS}/Microsoft MPI/Bin/mpiexec.exe") -set(MSMPI_EXPECTED_FULL_VERSION "9.0.12497") if(EXISTS "${SYSTEM_MPIEXEC_FILEPATH}") set(MPIEXEC_VERSION_LOGNAME "mpiexec-version") @@ -32,12 +33,12 @@ if(EXISTS "${SYSTEM_MPIEXEC_FILEPATH}") file(READ ${CURRENT_BUILDTREES_DIR}/${MPIEXEC_VERSION_LOGNAME}-out.log MPIEXEC_OUTPUT) if(MPIEXEC_OUTPUT MATCHES "\\[Version ([0-9]+\\.[0-9]+\\.[0-9]+)\\.[0-9]+\\]") - if(NOT CMAKE_MATCH_1 STREQUAL MSMPI_EXPECTED_FULL_VERSION) + if(NOT CMAKE_MATCH_1 STREQUAL MSMPI_VERSION) download_msmpi_redistributable_package() message(FATAL_ERROR " The version of the installed MSMPI redistributable packages does not match the version to be installed\n" - " Expected version: ${MSMPI_EXPECTED_FULL_VERSION}\n" + " Expected version: ${MSMPI_VERSION}\n" " Found version: ${CMAKE_MATCH_1}\n" " Please upgrade the installed version on your system.\n" " The appropriate installer for the expected version has been downloaded to:\n" @@ -131,5 +132,6 @@ if(TRIPLET_SYSTEM_ARCH STREQUAL "x86") endif() # Handle copyright -file(COPY "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/License/license_sdk.rtf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/msmpi) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/msmpi/copyright "See the accompanying license_sdk.rtf") +file(COPY "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/License/MicrosoftMPI-SDK-EULA.rtf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/msmpi) +file(COPY "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/License/MPI-SDK-TPN.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/msmpi) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/msmpi/copyright "See the accompanying MicrosoftMPI-SDK-EULA.rtf and MPI-SDK-TPN.txt") diff --git a/ports/nlohmann-json/CONTROL b/ports/nlohmann-json/CONTROL index 1e628ba81..6d8f59edc 100644 --- a/ports/nlohmann-json/CONTROL +++ b/ports/nlohmann-json/CONTROL @@ -1,3 +1,3 @@ Source: nlohmann-json -Version: 3.4.0 +Version: 3.5.0 Description: JSON for Modern C++ diff --git a/ports/nlohmann-json/portfile.cmake b/ports/nlohmann-json/portfile.cmake index d3926cab6..66096ce89 100644 --- a/ports/nlohmann-json/portfile.cmake +++ b/ports/nlohmann-json/portfile.cmake @@ -1,11 +1,11 @@ include(vcpkg_common_functions) -set(SOURCE_VERSION 3.4.0) +set(SOURCE_VERSION 3.5.0) vcpkg_download_distfile(HEADER URLS "https://github.com/nlohmann/json/releases/download/v${SOURCE_VERSION}/json.hpp" FILENAME "nlohmann-json-${SOURCE_VERSION}.hpp" - SHA512 a1bdb4b434ee34cbc360e0203f500b25e15d7e1a6d25ea6e3bd3b56a5e7ec47d8c0bbe074930b7a07d6ceaf2112eefa24da9c1f0595aaf12c88697048238166d + SHA512 6e8df9c0a8b5e74cc03f1c7620820215d43b642e213d30481830e5608c8196455dab5a5b604758c25dc6f45bd394fc0be6c8f8712a6498e96b3fd2e7d388d3c0 ) vcpkg_download_distfile(LICENSE diff --git a/ports/openal-soft/CONTROL b/ports/openal-soft/CONTROL index 6f16b26bd..cc30df1de 100644 --- a/ports/openal-soft/CONTROL +++ b/ports/openal-soft/CONTROL @@ -1,3 +1,3 @@ Source: openal-soft -Version: 1.19.1 +Version: 1.19.1-1 Description: OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API. diff --git a/ports/openssl-unix/CONTROL b/ports/openssl-unix/CONTROL index 28dc5da98..59f686133 100644 --- a/ports/openssl-unix/CONTROL +++ b/ports/openssl-unix/CONTROL @@ -1,3 +1,3 @@ Source: openssl-unix -Version: 1.0.2p-1 +Version: 1.0.2q Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library. diff --git a/ports/openssl-unix/portfile.cmake b/ports/openssl-unix/portfile.cmake index c877905bb..b0064cdf4 100644 --- a/ports/openssl-unix/portfile.cmake +++ b/ports/openssl-unix/portfile.cmake @@ -3,14 +3,14 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAM endif() include(vcpkg_common_functions) -set(OPENSSL_VERSION 1.0.2p) +set(OPENSSL_VERSION 1.0.2q) vcpkg_find_acquire_program(PERL) vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.0.2/openssl-${OPENSSL_VERSION}.tar.gz" FILENAME "openssl-${OPENSSL_VERSION}.tar.gz" - SHA512 958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16 + SHA512 403e6cad42db3ba860c3fa4fa81c1b7b02f0b873259e5c19a7fc8e42de0854602555f1b1ca74f4e3a7737a4cbd3aac063061e628ec86534586500819fae7fec0 ) vcpkg_extract_source_archive_ex( diff --git a/ports/openssl-uwp/CONTROL b/ports/openssl-uwp/CONTROL index 4b4871f3c..1bfa6651a 100644 --- a/ports/openssl-uwp/CONTROL +++ b/ports/openssl-uwp/CONTROL @@ -1,3 +1,3 @@ Source: openssl-uwp -Version: 1.0.2l-winrt +Version: 1.0.2q-winrt-1 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library. diff --git a/ports/openssl-uwp/fix-uwp-configure-unicode.patch b/ports/openssl-uwp/fix-uwp-configure-unicode.patch new file mode 100644 index 000000000..a3b645ad1 --- /dev/null +++ b/ports/openssl-uwp/fix-uwp-configure-unicode.patch @@ -0,0 +1,19 @@ +diff --git a/Configure b/Configure +index 67df080..57a15d8 100644 +--- a/Configure ++++ b/Configure +@@ -598,12 +598,12 @@ my %table=( + # 'perl Configure VC-WINSTORE + "VC-WINSTORE","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + # 'perf Configure VC-WINUNIVERSAL +-"VC-WINUNIVERSAL","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", ++"VC-WINUNIVERSAL","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -DWINAPI_FAMILY=WINAPI_FAMILY_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + + "debug-VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + "debug-VC-WINPHONE","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DOPENSSL_WINAPP -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + "debug-VC-WINSTORE","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", +-"debug-VC-WINUNIVERSAL","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DOPENSSL_WINUCRT -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", ++"debug-VC-WINUNIVERSAL","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -DWINAPI_FAMILY=WINAPI_FAMILY_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DOPENSSL_WINUCRT -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + + # Unified CE target + "VC-CE","cl::::WINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${no_asm}:win32", diff --git a/ports/openssl-uwp/portfile.cmake b/ports/openssl-uwp/portfile.cmake index ef9801380..83eff7dcc 100644 --- a/ports/openssl-uwp/portfile.cmake +++ b/ports/openssl-uwp/portfile.cmake @@ -19,7 +19,6 @@ endif() include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-OpenSSL_1_0_2l_WinRT) vcpkg_find_acquire_program(PERL) vcpkg_find_acquire_program(JOM) @@ -28,16 +27,17 @@ get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH};${JOM_EXE_PATH}") vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/Microsoft/openssl/archive/OpenSSL_1_0_2l_WinRT.zip" - FILENAME "openssl-microsoft-1.0.2l_WinRT.zip" - SHA512 238b3daad7f1a2486e09d47e6d1bd4b0aa8e8a896358c6dfe11a77c2654da1b29d3c7612f9d200d5be5a020f33d96fe39cd75b99aa35aa4129feb756f7f98ee8 + URLS "https://github.com/Microsoft/openssl/archive/OpenSSL_1_0_2q_WinRT.zip" + FILENAME "openssl-microsoft-1.0.2q_WinRT.zip" + SHA512 828ddeb10b7d04155df64cb38f3d8b8109ff01494fed7f6c1063673e45414c1c309379e8bbe72478bd0fbae649d6749877c20b1b4a91db136a0853745f4da6b6 ) -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-rs4.patch +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-rs4.patch + ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-configure-unicode.patch ) file(REMOVE_RECURSE ${SOURCE_PATH}/tmp32dll) diff --git a/ports/parmetis/portfile.cmake b/ports/parmetis/portfile.cmake index c6022ad47..ba34e47e8 100644 --- a/ports/parmetis/portfile.cmake +++ b/ports/parmetis/portfile.cmake @@ -7,21 +7,22 @@ # include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/parmetis-4.0.3) + vcpkg_download_distfile(ARCHIVE URLS "http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz" FILENAME "parmetis-4.0.3.tar.gz" SHA512 454a91921ca35c981df11c9846a11963ff8fd8407a25179453af33f8fe69493f6dd7f2a0b8feed9a7d3f121e45b715749dd7a94873eaac2bae4cad1e535ca132 ) -vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/fix-metis-vs14-math.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-gklib-vs14-math.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-root-cmakelist.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-libparmetis-cmakelist.patch + fix-metis-vs14-math.patch + fix-gklib-vs14-math.patch + fix-root-cmakelist.patch + fix-libparmetis-cmakelist.patch + use_stdint.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/ports/parmetis/use_stdint.patch b/ports/parmetis/use_stdint.patch new file mode 100644 index 000000000..5b239e60c --- /dev/null +++ b/ports/parmetis/use_stdint.patch @@ -0,0 +1,22 @@ +diff --git a/metis/GKlib/ms_stdint.h b/metis/GKlib/ms_stdint.h
+index 7e200dc..0d07a7a 100644
+--- a/metis/GKlib/ms_stdint.h
++++ b/metis/GKlib/ms_stdint.h
+@@ -42,6 +42,10 @@
+
+ #include <limits.h>
+
++#if(_MSC_VER >= 1900)
++ #include <stdint.h>
++#else
++
+ // For Visual Studio 6 in C++ mode wrap <wchar.h> include with 'extern "C++" {}'
+ // or compiler give many errors like this:
+ // error C2733: second C linkage of overloaded function 'wmemchr' not allowed
+@@ -218,5 +222,6 @@ typedef uint64_t uintmax_t;
+
+ #endif // __STDC_CONSTANT_MACROS ]
+
++#endif
+
+ #endif // _MSC_STDINT_H_ ]
diff --git a/ports/parquet/CONTROL b/ports/parquet/CONTROL index c9288597e..21584e8ee 100644 --- a/ports/parquet/CONTROL +++ b/ports/parquet/CONTROL @@ -1,4 +1,4 @@ Source: parquet -Version: 1.4.0 -Build-Depends: arrow, thrift, gtest -Description: Parquet-cpp is a C++ library to read and write the Apache Parquet columnar data format.
\ No newline at end of file +Version: 0 +Build-Depends: arrow +Description: Parquet-cpp is a C++ library to read and write the Apache Parquet columnar data format. It is now part of the arrow library.
\ No newline at end of file diff --git a/ports/parquet/all.patch b/ports/parquet/all.patch deleted file mode 100644 index e9ec99662..000000000 --- a/ports/parquet/all.patch +++ /dev/null @@ -1,779 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 304f3fb..0b0fc1f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,7 +16,7 @@ - # under the License. - - # Require cmake that supports BYPRODUCTS in add_custom_command, ExternalProject_Add [1]. --cmake_minimum_required(VERSION 3.2.0) -+cmake_minimum_required(VERSION 3.8) - - file(READ "${CMAKE_CURRENT_SOURCE_DIR}/.parquetcppversion" PARQUET_VERSION) - string(REPLACE "\n" "" PARQUET_VERSION "${PARQUET_VERSION}") -@@ -25,6 +25,10 @@ if(NOT VERSION) - message(FATAL_ERROR "invalid .parquetcppversion") - endif() - -+if(NOT DEFINED ARROW_LIB_SUFFIX) -+ set(ARROW_LIB_SUFFIX "") -+endif() -+ - project(parquet-cpp VERSION ${VERSION}) - set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "C++ library to read and write the Apache Parquet columnar data format") - set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) -@@ -528,37 +532,25 @@ endif() - ############################################################# - # Apache Arrow linkage - --if ("${PARQUET_ARROW_LINKAGE}" STREQUAL "shared") -+if ("${PARQUET_ARROW_LINKAGE}" STREQUAL "dynamic") - set(ARROW_LINK_LIBS -- arrow) -+ arrow_static) - else() - ############################################################# - # Transitive Library Linkage -- -- if (NOT DEFINED ENV{BROTLI_STATIC_LIB_ENC} OR -- NOT DEFINED ENV{BROTLI_STATIC_LIB_DEC} OR -- NOT DEFINED ENV{BROTLI_STATIC_LIB_COMMON} OR -- NOT DEFINED ENV{SNAPPY_STATIC_LIB} OR -- NOT DEFINED ENV{ZLIB_STATIC_LIB} OR -- NOT DEFINED ENV{LZ4_STATIC_LIB} OR -- NOT DEFINED ENV{ZSTD_STATIC_LIB}) -- message(FATAL_ERROR "Missing transitive dependencies for Arrow static linking") -- endif() -- -- set(BROTLI_STATIC_LIB_ENC "$ENV{BROTLI_STATIC_LIB_ENC}") -- set(BROTLI_STATIC_LIB_DEC "$ENV{BROTLI_STATIC_LIB_DEC}") -- set(BROTLI_STATIC_LIB_COMMON "$ENV{BROTLI_STATIC_LIB_COMMON}") -- set(SNAPPY_STATIC_LIB "$ENV{SNAPPY_STATIC_LIB}") -- set(ZLIB_STATIC_LIB "$ENV{ZLIB_STATIC_LIB}") -- set(LZ4_STATIC_LIB "$ENV{LZ4_STATIC_LIB}") -- set(ZSTD_STATIC_LIB "$ENV{ZSTD_STATIC_LIB}") -- -+ -+ find_package(Brotli REQUIRED) -+ find_package(Snappy REQUIRED) -+ find_package(LZ4 REQUIRED) -+ find_package(ZLIB REQUIRED) -+ find_package(ZSTD REQUIRED) -+ - add_library(brotli_enc STATIC IMPORTED) -- set_target_properties(brotli_enc PROPERTIES IMPORTED_LOCATION ${BROTLI_STATIC_LIB_ENC}) -+ set_target_properties(brotli_enc PROPERTIES IMPORTED_LOCATION ${BROTLI_STATIC_LIBRARY_ENC}) - add_library(brotli_dec STATIC IMPORTED) -- set_target_properties(brotli_dec PROPERTIES IMPORTED_LOCATION ${BROTLI_STATIC_LIB_DEC}) -+ set_target_properties(brotli_dec PROPERTIES IMPORTED_LOCATION ${BROTLI_STATIC_LIBRARY_DEC}) - add_library(brotli_common STATIC IMPORTED) -- set_target_properties(brotli_common PROPERTIES IMPORTED_LOCATION ${BROTLI_STATIC_LIB_COMMON}) -+ set_target_properties(brotli_common PROPERTIES IMPORTED_LOCATION ${BROTLI_STATIC_LIBRARY_COMMON}) - add_library(snappy STATIC IMPORTED) - set_target_properties(snappy PROPERTIES IMPORTED_LOCATION ${SNAPPY_STATIC_LIB}) - add_library(zlib STATIC IMPORTED) -@@ -588,9 +580,7 @@ endif() - ############################################################# - # Test linking - --set(PARQUET_MIN_TEST_LIBS -- gtest -- gtest_main) -+set(PARQUET_MIN_TEST_LIBS GTest::GTest GTest::Main) - - if (APPLE) - set(PARQUET_MIN_TEST_LIBS -diff --git a/cmake_modules/FindArrow.cmake b/cmake_modules/FindArrow.cmake -index b63b1af..3329c4a 100644 ---- a/cmake_modules/FindArrow.cmake -+++ b/cmake_modules/FindArrow.cmake -@@ -22,76 +22,21 @@ - # ARROW_SHARED_LIB, path to libarrow's shared library - # ARROW_FOUND, whether arrow has been found - --if (DEFINED ENV{ARROW_HOME}) -- set(ARROW_HOME "$ENV{ARROW_HOME}") --endif() -- --if ("${ARROW_HOME}" STREQUAL "") -- # PARQUET-955. If the user has set $ARROW_HOME in the environment, we respect -- # this, otherwise try to locate the pkgconfig in the system environment -- pkg_check_modules(ARROW arrow) -- if (ARROW_FOUND) -- # We found the pkgconfig -- set(ARROW_INCLUDE_DIR ${ARROW_INCLUDE_DIRS}) -- -- if (COMMAND pkg_get_variable) -- pkg_get_variable(ARROW_ABI_VERSION arrow abi_version) -- else() -- set(ARROW_ABI_VERSION "") -- endif() -- if (ARROW_ABI_VERSION STREQUAL "") -- set(ARROW_SHARED_LIB_SUFFIX "") -- else() -- set(ARROW_SHARED_LIB_SUFFIX ".${ARROW_ABI_VERSION}") -- endif() -- -- set(ARROW_LIB_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}arrow) -- -- if (APPLE) -- set(ARROW_SHARED_LIB ${ARROW_LIBDIR}/${ARROW_LIB_NAME}${ARROW_SHARED_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) -- else() -- set(ARROW_SHARED_LIB ${ARROW_LIBDIR}/${ARROW_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}${ARROW_SHARED_LIB_SUFFIX}) -- endif() -- set(ARROW_STATIC_LIB ${ARROW_LIBDIR}/${ARROW_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}) -- endif() --else() -- set(ARROW_HOME "${ARROW_HOME}") -+find_path(ARROW_INCLUDE_DIR arrow/array.h -+ PATH_SUFFIXES "include" -+ ) - -- if (MSVC AND NOT ARROW_MSVC_STATIC_LIB_SUFFIX) -- set(ARROW_MSVC_STATIC_LIB_SUFFIX _static) -- endif() -+find_library(ARROW_LIB_PATH NAMES arrow) - -- set(ARROW_SEARCH_HEADER_PATHS -- ${ARROW_HOME}/include -- ) -+if (ARROW_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR ARROW_LIB_PATH)) -+ set(ARROW_FOUND TRUE) -+ set(ARROW_HEADER_NAME arrow/api.h) -+ set(ARROW_HEADER ${ARROW_INCLUDE_DIR}/${ARROW_HEADER_NAME}) -+ set(ARROW_LIB_NAME arrow) - -- set(ARROW_SEARCH_LIB_PATH -- ${ARROW_HOME}/lib -- ) -- -- find_path(ARROW_INCLUDE_DIR arrow/array.h PATHS -- ${ARROW_SEARCH_HEADER_PATHS} -- # make sure we don't accidentally pick up a different version -- NO_DEFAULT_PATH -- ) -- -- find_library(ARROW_LIB_PATH NAMES arrow arrow${ARROW_MSVC_STATIC_LIB_SUFFIX} -- PATHS -- ${ARROW_SEARCH_LIB_PATH} -- NO_DEFAULT_PATH) -- -- if (ARROW_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR ARROW_LIB_PATH)) -- set(ARROW_FOUND TRUE) -- set(ARROW_HEADER_NAME arrow/api.h) -- set(ARROW_HEADER ${ARROW_INCLUDE_DIR}/${ARROW_HEADER_NAME}) -- set(ARROW_LIB_NAME arrow) -- -- get_filename_component(ARROW_LIBS ${ARROW_LIB_PATH} DIRECTORY) -- set(ARROW_STATIC_LIB ${ARROW_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${ARROW_LIB_NAME}${ARROW_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}) -- set(ARROW_SHARED_LIB ${ARROW_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${ARROW_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}) -- set(ARROW_SHARED_IMPLIB ${ARROW_LIBS}/${ARROW_LIB_NAME}.lib) -- endif () --endif() -+ set(ARROW_STATIC_LIB ${ARROW_LIB_PATH}) -+ set(ARROW_SHARED_LIB ${ARROW_LIB_PATH}) -+endif () - - if (ARROW_FOUND) - if (NOT Arrow_FIND_QUIETLY) -diff --git a/cmake_modules/FindBrotli.cmake b/cmake_modules/FindBrotli.cmake -index f2e714c..9561660 100644 ---- a/cmake_modules/FindBrotli.cmake -+++ b/cmake_modules/FindBrotli.cmake -@@ -17,13 +17,6 @@ - # - # find_package(Brotli) - # --# Variables used by this module, they can change the default behaviour and need --# to be set before calling find_package: --# --# Brotli_HOME - When set, this path is inspected instead of standard library --# locations as the root of the Brotli installation. --# The environment variable BROTLI_HOME overrides this veriable. --# - # This module defines - # BROTLI_INCLUDE_DIR, directory containing headers - # BROTLI_LIBS, directory containing brotli libraries -@@ -31,80 +24,37 @@ - # BROTLI_SHARED_LIB, path to libbrotli's shared library - # BROTLI_FOUND, whether brotli has been found - --if( NOT "${BROTLI_HOME}" STREQUAL "") -- file( TO_CMAKE_PATH "${BROTLI_HOME}" _native_path ) -- list( APPEND _brotli_roots ${_native_path} ) --elseif ( Brotli_HOME ) -- list( APPEND _brotli_roots ${Brotli_HOME} ) --endif() -- - find_path( BROTLI_INCLUDE_DIR NAMES brotli/decode.h -- PATHS ${_brotli_roots} -- NO_DEFAULT_PATH - PATH_SUFFIXES "include" ) -- --find_library( BROTLI_LIBRARY_ENC NAMES libbrotlienc.a brotlienc -- PATHS ${_brotli_roots} -- NO_DEFAULT_PATH -- PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ) -- --find_library( BROTLI_LIBRARY_DEC NAMES libbrotlidec.a brotlidec -- PATHS ${_brotli_roots} -- NO_DEFAULT_PATH -- PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ) -- --find_library( BROTLI_LIBRARY_COMMON NAMES libbrotlicommon.a brotlicommon -- PATHS ${_brotli_roots} -- NO_DEFAULT_PATH -- PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" ) -+ -+find_library( BROTLI_LIBRARY_ENC NAMES libbrotlienc.a brotlienc brotlienc-static ) -+find_library( BROTLI_LIBRARY_DEC NAMES libbrotlidec.a brotlidec brotlidec-static ) -+find_library( BROTLI_LIBRARY_COMMON NAMES libbrotlicommon.a brotlicommon brotlicommon-static ) - - set(BROTLI_LIBRARIES ${BROTLI_LIBRARY_ENC} ${BROTLI_LIBRARY_DEC} - ${BROTLI_LIBRARY_COMMON}) - --if (BROTLI_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR BROTLI_LIBRARIES)) -+if (BROTLI_INCLUDE_DIR) - 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_LIBRARY_ENC} -+ ${BROTLI_LIBRARY_DEC} -+ ${BROTLI_LIBRARY_COMMON}) -+ set(BROTLI_STATIC_LIBRARY_ENC ${BROTLI_LIBRARY_ENC}) -+ set(BROTLI_STATIC_LIBRARY_DEC ${BROTLI_LIBRARY_DEC}) -+ set(BROTLI_STATIC_LIBRARY_COMMON ${BROTLI_LIBRARY_COMMON}) - 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} -- ${BROTLI_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${CMAKE_SHARED_LIBRARY_SUFFIX}) -+ ${BROTLI_LIBRARY_ENC} -+ ${BROTLI_LIBRARY_DEC} -+ ${BROTLI_LIBRARY_COMMON}) - else () - set(BROTLI_FOUND FALSE) - endif () - - if (BROTLI_FOUND) -- if (NOT Brotli_FIND_QUIETLY) -- if (PARQUET_MINIMAL_DEPENDENCY) -- message(STATUS "Found the Brotli headers: ${BROTLI_INCLUDE_DIR}") -- else () -- message(STATUS "Found the Brotli library: ${BROTLI_LIBRARIES}") -- endif () -- endif () -+ message(STATUS "Found the Brotli library: ${BROTLI_LIBRARIES}") - else () -- if (NOT Brotli_FIND_QUIETLY) -- set(BROTLI_ERR_MSG "Could not find the Brotli library. Looked in ") -- if ( _brotli_roots ) -- set(BROTLI_ERR_MSG "${BROTLI_ERR_MSG} in ${_brotli_roots}.") -- else () -- set(BROTLI_ERR_MSG "${BROTLI_ERR_MSG} system search paths.") -- endif () -- if (Brotli_FIND_REQUIRED) -- message(FATAL_ERROR "${BROTLI_ERR_MSG}") -- else (Brotli_FIND_REQUIRED) -- message(STATUS "${BROTLI_ERR_MSG}") -- endif (Brotli_FIND_REQUIRED) -- endif () -+ message(FATAL_ERROR "Could not find the Brotli library.") - endif () - - mark_as_advanced( -diff --git a/cmake_modules/FindGTest.cmake b/cmake_modules/FindGTest.cmake -deleted file mode 100644 -index c6ea16b..0000000 ---- a/cmake_modules/FindGTest.cmake -+++ /dev/null -@@ -1,94 +0,0 @@ --# --# Licensed under the Apache License, Version 2.0 (the "License"); --# you may not use this file except in compliance with the License. --# You may obtain a copy of the License at --# --# http://www.apache.org/licenses/LICENSE-2.0 --# --# Unless required by applicable law or agreed to in writing, software --# distributed under the License is distributed on an "AS IS" BASIS, --# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --# See the License for the specific language governing permissions and --# limitations under the License. --# --# Tries to find GTest headers and libraries. --# --# Usage of this module as follows: --# --# find_package(GTest) --# --# Variables used by this module, they can change the default behaviour and need --# to be set before calling find_package: --# --# GTest_HOME - When set, this path is inspected instead of standard library --# locations as the root of the GTest installation. --# The environment variable GTEST_HOME overrides this veriable. --# --# This module defines --# GTEST_INCLUDE_DIR, directory containing headers --# GTEST_LIBS, directory containing gtest libraries --# GTEST_STATIC_LIB, path to libgtest.a --# GTEST_MAIN_STATIC_LIB, path to libgtest_main.a --# GTEST_SHARED_LIB, path to libgtest's shared library --# GTEST_FOUND, whether gtest has been found -- --if( NOT "$ENV{GTEST_HOME}" STREQUAL "") -- file( TO_CMAKE_PATH "$ENV{GTEST_HOME}" _native_path ) -- list( APPEND _gtest_roots ${_native_path} ) --elseif ( GTest_HOME ) -- list( APPEND _gtest_roots ${GTest_HOME} ) --endif() -- --# Try the parameterized roots, if they exist --if ( _gtest_roots ) -- find_path( GTEST_INCLUDE_DIR NAMES gtest/gtest.h -- PATHS ${_gtest_roots} NO_DEFAULT_PATH -- PATH_SUFFIXES "include" ) -- find_library( GTEST_LIBRARIES NAMES gtest gtest_main -- PATHS ${_gtest_roots} NO_DEFAULT_PATH -- PATH_SUFFIXES "lib" ) --else () -- find_path( GTEST_INCLUDE_DIR NAMES gtest/gtest.h ) -- find_library( GTEST_LIBRARIES NAMES gtest ) --endif () -- -- --if (GTEST_INCLUDE_DIR AND GTEST_LIBRARIES) -- set(GTEST_FOUND TRUE) -- get_filename_component( GTEST_LIBS ${GTEST_LIBRARIES} PATH ) -- set(GTEST_LIB_NAME gtest) -- set(GTEST_STATIC_LIB ${GTEST_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${GTEST_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}) -- set(GTEST_MAIN_STATIC_LIB ${GTEST_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${GTEST_LIB_NAME}_main${CMAKE_STATIC_LIBRARY_SUFFIX}) -- set(GTEST_SHARED_LIB ${GTEST_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${GTEST_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}) --else () -- set(GTEST_FOUND FALSE) --endif () -- --if (GTEST_FOUND) -- if (NOT GTest_FIND_QUIETLY) -- message(STATUS "Found the GTest library: ${GTEST_LIBRARIES}") -- endif () --else () -- if (NOT GTest_FIND_QUIETLY) -- set(GTEST_ERR_MSG "Could not find the GTest library. Looked in ") -- if ( _gtest_roots ) -- set(GTEST_ERR_MSG "${GTEST_ERR_MSG} in ${_gtest_roots}.") -- else () -- set(GTEST_ERR_MSG "${GTEST_ERR_MSG} system search paths.") -- endif () -- if (GTest_FIND_REQUIRED) -- message(FATAL_ERROR "${GTEST_ERR_MSG}") -- else (GTest_FIND_REQUIRED) -- message(STATUS "${GTEST_ERR_MSG}") -- endif (GTest_FIND_REQUIRED) -- endif () --endif () -- --mark_as_advanced( -- GTEST_INCLUDE_DIR -- GTEST_LIBS -- GTEST_LIBRARIES -- GTEST_STATIC_LIB -- GTEST_MAIN_STATIC_LIB -- GTEST_SHARED_LIB --) -diff --git a/cmake_modules/FindLZ4.cmake b/cmake_modules/FindLZ4.cmake -new file mode 100644 -index 0000000..8458d7f ---- /dev/null -+++ b/cmake_modules/FindLZ4.cmake -@@ -0,0 +1,62 @@ -+# -+# Licensed under the Apache License, Version 2.0 (the "License"); -+# you may not use this file except in compliance with the License. -+# You may obtain a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, software -+# distributed under the License is distributed on an "AS IS" BASIS, -+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+# See the License for the specific language governing permissions and -+# limitations under the License. -+# -+# Tries to find LZ4 headers and libraries. -+# -+# Usage of this module as follows: -+# -+# find_package(Snappy) -+# -+# This module defines -+# LZ4_INCLUDE_DIR, directory containing headers -+# LZ4_LIBS, directory containing LZ4 libraries -+# LZ4_STATIC_LIB, path to lz4.a -+# LZ4_SHARED_LIB, path to lz4's shared library -+# LZ4_FOUND, whether LZ4 has been found -+ -+find_path(LZ4_INCLUDE_DIR lz4.h -+ PATH_SUFFIXES "include") -+ -+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -+ set(LZ4_LIB_SUFFIX "d") -+else() -+ set(LZ4_LIB_SUFFIX "") -+endif() -+ -+find_library( LZ4_LIBRARIES NAMES lz4${LZ4_LIB_SUFFIX} -+ PATH_SUFFIXES "lib") -+ -+if (LZ4_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR LZ4_LIBRARIES)) -+ set(LZ4_FOUND TRUE) -+ get_filename_component( LZ4_LIBS ${LZ4_LIBRARIES} PATH ) -+ set(LZ4_HEADER_NAME lz4.h) -+ set(LZ4_HEADER ${LZ4_INCLUDE_DIR}/${LZ4_HEADER_NAME}) -+ set(LZ4_STATIC_LIB ${LZ4_LIBRARIES}) -+ set(LZ4_SHARED_LIB ${LZ4_LIBRARIES}) -+else () -+ set(LZ4_FOUND FALSE) -+endif () -+ -+if (LZ4_FOUND) -+ message(STATUS "Found the LZ4 library: ${LZ4_LIBRARIES}") -+else () -+ message(FATAL_ERROR "Could not find the LZ4 library.") -+endif () -+ -+mark_as_advanced( -+ LZ4_INCLUDE_DIR -+ LZ4_LIBS -+ LZ4_LIBRARIES -+ LZ4_STATIC_LIB -+ LZ4_SHARED_LIB -+) -diff --git a/cmake_modules/FindSnappy.cmake b/cmake_modules/FindSnappy.cmake -index 867963c..cc68688 100644 ---- a/cmake_modules/FindSnappy.cmake -+++ b/cmake_modules/FindSnappy.cmake -@@ -17,13 +17,6 @@ - # - # find_package(Snappy) - # --# Variables used by this module, they can change the default behaviour and need --# to be set before calling find_package: --# --# Snappy_HOME - When set, this path is inspected instead of standard library --# locations as the root of the Snappy installation. --# The environment variable SNAPPY_HOME overrides this variable. --# - # This module defines - # SNAPPY_INCLUDE_DIR, directory containing headers - # SNAPPY_LIBS, directory containing snappy libraries -@@ -31,22 +24,16 @@ - # SNAPPY_SHARED_LIB, path to libsnappy's shared library - # SNAPPY_FOUND, whether snappy has been found - --if( NOT "${SNAPPY_HOME}" STREQUAL "") -- file( TO_CMAKE_PATH "${SNAPPY_HOME}" _native_path ) -- list( APPEND _snappy_roots ${_native_path} ) --elseif ( Snappy_HOME ) -- list( APPEND _snappy_roots ${Snappy_HOME} ) --endif() -- --message(STATUS "SNAPPY_HOME: ${SNAPPY_HOME}") --find_path(SNAPPY_INCLUDE_DIR snappy.h HINTS -- ${_snappy_roots} -- NO_DEFAULT_PATH -+find_path(SNAPPY_INCLUDE_DIR snappy.h - PATH_SUFFIXES "include") -+ -+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -+ set(SNAPPY_LIB_SUFFIX "d") -+else() -+ set(SNAPPY_LIB_SUFFIX "") -+endif() - --find_library( SNAPPY_LIBRARIES NAMES snappy PATHS -- ${_snappy_roots} -- NO_DEFAULT_PATH -+find_library( SNAPPY_LIBRARIES NAMES snappy${SNAPPY_LIB_SUFFIX} - PATH_SUFFIXES "lib") - - if (SNAPPY_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR SNAPPY_LIBRARIES)) -@@ -54,9 +41,8 @@ if (SNAPPY_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR SNAPPY_LIBRARIES)) - get_filename_component( SNAPPY_LIBS ${SNAPPY_LIBRARIES} PATH ) - 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_SHARED_LIB ${SNAPPY_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}) -+ set(SNAPPY_STATIC_LIB ${SNAPPY_LIBRARIES}) -+ set(SNAPPY_SHARED_LIB ${SNAPPY_LIBRARIES}) - else () - set(SNAPPY_FOUND FALSE) - endif () -diff --git a/cmake_modules/FindThrift.cmake b/cmake_modules/FindThrift.cmake -index 25f5082..f27857f 100644 ---- a/cmake_modules/FindThrift.cmake -+++ b/cmake_modules/FindThrift.cmake -@@ -14,55 +14,28 @@ - - # - Find Thrift (a cross platform RPC lib/tool) - # --# Variables used by this module, they can change the default behaviour and need --# to be set before calling find_package: --# --# Thrift_HOME - When set, this path is inspected instead of standard library --# locations as the root of the Thrift installation. --# The environment variable THRIFT_HOME overrides this variable. --# - # This module defines - # THRIFT_VERSION, version string of ant if found - # THRIFT_INCLUDE_DIR, where to find THRIFT headers --# THRIFT_CONTRIB_DIR, where contrib thrift files (e.g. fb303.thrift) are installed - # THRIFT_STATIC_LIB, THRIFT static library - # THRIFT_FOUND, If false, do not try to use ant - --# prefer the thrift version supplied in THRIFT_HOME --if( NOT "${THRIFT_HOME}" STREQUAL "") -- file( TO_CMAKE_PATH "${THRIFT_HOME}" _native_path ) -- list( APPEND _thrift_roots ${_native_path} ) --elseif ( Thrift_HOME ) -- list( APPEND _thrift_roots ${Thrift_HOME} ) --endif() -- --message(STATUS "THRIFT_HOME: ${THRIFT_HOME}") --find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h HINTS -- ${_thrift_roots} -- NO_DEFAULT_PATH -+find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h - PATH_SUFFIXES "include" - ) - --find_path(THRIFT_CONTRIB_DIR share/fb303/if/fb303.thrift HINTS -- ${_thrift_roots} -- NO_DEFAULT_PATH --) -- --if (MSVC AND NOT THRIFT_MSVC_STATIC_LIB_SUFFIX) -- set(THRIFT_MSVC_STATIC_LIB_SUFFIX md) -+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -+ set(THRIFT_LIB_SUFFIX mdd) -+else() -+ set(THRIFT_LIB_SUFFIX md) - endif() - - find_library(THRIFT_STATIC_LIB NAMES -- ${CMAKE_STATIC_LIBRARY_PREFIX}thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX} -- HINTS ${_thrift_roots} -- NO_DEFAULT_PATH -- PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" -+ thrift${THRIFT_LIB_SUFFIX} - ) - - find_program(THRIFT_COMPILER thrift HINTS -- ${_thrift_roots} -- NO_DEFAULT_PATH -- PATH_SUFFIXES "bin" -+ PATH_SUFFIXES "tools" - ) - - if (THRIFT_STATIC_LIB) -@@ -94,7 +67,6 @@ else () - endif () - endif () - -- - mark_as_advanced( - THRIFT_STATIC_LIB - THRIFT_COMPILER -diff --git a/cmake_modules/FindZLIB.cmake b/cmake_modules/FindZLIB.cmake -index 78b84f2..1ef0305 100644 ---- a/cmake_modules/FindZLIB.cmake -+++ b/cmake_modules/FindZLIB.cmake -@@ -32,27 +32,17 @@ - # ZLIB_SHARED_LIB, path to libz's shared library - # ZLIB_FOUND, whether zlib has been found - --if( NOT "${ZLIB_HOME}" STREQUAL "") -- file( TO_CMAKE_PATH "${ZLIB_HOME}" _native_path ) -- list( APPEND _zlib_roots ${_native_path} ) --elseif ( ZLIB_HOME ) -- list( APPEND _zlib_roots ${ZLIB_HOME} ) -+find_path( ZLIB_INCLUDE_DIR NAMES zlib.h -+ PATH_SUFFIXES "include" ) -+ -+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -+ set(ZLIB_LIB_SUFFIX "d") -+else() -+ set(ZLIB_LIB_SUFFIX "") - endif() -- --# Try the parameterized roots, if they exist --if ( _zlib_roots ) -- find_path( ZLIB_INCLUDE_DIR NAMES zlib.h -- PATHS ${_zlib_roots} NO_DEFAULT_PATH -- PATH_SUFFIXES "include" ) -- find_library( ZLIB_LIBRARIES NAMES libz.a zlib -- PATHS ${_zlib_roots} NO_DEFAULT_PATH -- PATH_SUFFIXES "lib" ) --else () -- find_path( ZLIB_INCLUDE_DIR NAMES zlib.h ) -- # Only look for the static library -- find_library( ZLIB_LIBRARIES NAMES libz.a zlib ) --endif () -- -+ -+find_library( ZLIB_LIBRARIES NAMES libz.a zlib${ZLIB_LIB_SUFFIX} -+ PATH_SUFFIXES "lib" ) - - if (ZLIB_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR ZLIB_LIBRARIES)) - set(ZLIB_FOUND TRUE) -@@ -66,8 +56,8 @@ if (ZLIB_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR ZLIB_LIBRARIES)) - 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_SHARED_LIB ${ZLIB_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${ZLIB_MSVC_SHARED_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) -+ set(ZLIB_STATIC_LIB ${ZLIB_LIBRARIES}) -+ set(ZLIB_SHARED_LIB ${ZLIB_LIBRARIES}) - else () - set(ZLIB_FOUND FALSE) - endif () -diff --git a/cmake_modules/FindZSTD.cmake b/cmake_modules/FindZSTD.cmake -new file mode 100644 -index 0000000..062cfa9 ---- /dev/null -+++ b/cmake_modules/FindZSTD.cmake -@@ -0,0 +1,62 @@ -+# -+# Licensed under the Apache License, Version 2.0 (the "License"); -+# you may not use this file except in compliance with the License. -+# You may obtain a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, software -+# distributed under the License is distributed on an "AS IS" BASIS, -+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+# See the License for the specific language governing permissions and -+# limitations under the License. -+# -+# Tries to find ZSTD headers and libraries. -+# -+# Usage of this module as follows: -+# -+# find_package(Snappy) -+# -+# This module defines -+# ZSTD_INCLUDE_DIR, directory containing headers -+# ZSTD_LIBS, directory containing ZSTD libraries -+# ZSTD_STATIC_LIB, path to zstd.a -+# ZSTD_SHARED_LIB, path to ZSTD's shared library -+# ZSTD_FOUND, whether ZSTD has been found -+ -+find_path(ZSTD_INCLUDE_DIR ZSTD.h -+ PATH_SUFFIXES "include") -+ -+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -+ set(ZSTD_LIB_SUFFIX "d") -+else() -+ set(ZSTD_LIB_SUFFIX "") -+endif() -+ -+find_library( ZSTD_LIBRARIES NAMES zstd${ZSTD_LIB_SUFFIX} zstd_static${ZSTD_LIB_SUFFIX} -+ PATH_SUFFIXES "lib") -+ -+if (ZSTD_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR ZSTD_LIBRARIES)) -+ set(ZSTD_FOUND TRUE) -+ get_filename_component( ZSTD_LIBS ${ZSTD_LIBRARIES} PATH ) -+ set(ZSTD_HEADER_NAME zstd.h) -+ set(ZSTD_HEADER ${ZSTD_INCLUDE_DIR}/${ZSTD_HEADER_NAME}) -+ set(ZSTD_STATIC_LIB ${ZSTD_LIBRARIES}) -+ set(ZSTD_SHARED_LIB ${ZSTD_LIBRARIES}) -+else () -+ set(ZSTD_FOUND FALSE) -+endif () -+ -+if (ZSTD_FOUND) -+ message(STATUS "Found the ZSTD library: ${ZSTD_LIBRARIES}") -+else () -+ message(FATAL_ERROR "Could not find the ZSTD library.") -+endif () -+ -+mark_as_advanced( -+ ZSTD_INCLUDE_DIR -+ ZSTD_LIBS -+ ZSTD_LIBRARIES -+ ZSTD_STATIC_LIB -+ ZSTD_SHARED_LIB -+) -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake -index 690fd0b..d74bb3d 100644 ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -276,54 +276,11 @@ endif() - if(PARQUET_BUILD_TESTS AND NOT IGNORE_OPTIONAL_PACKAGES) - add_custom_target(unittest ctest -L unittest) - -- if("$ENV{GTEST_HOME}" STREQUAL "") -- if(APPLE) -- set(GTEST_CMAKE_CXX_FLAGS "${EP_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1 -Wno-unused-value -Wno-ignored-attributes") -- else() -- set(GTEST_CMAKE_CXX_FLAGS "${EP_CXX_FLAGS}") -- endif() -- -- set(GTEST_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/googletest_ep-prefix/src/googletest_ep") -- set(GTEST_INCLUDE_DIR "${GTEST_PREFIX}/include") -- set(GTEST_STATIC_LIB -- "${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}") -- set(GTEST_MAIN_STATIC_LIB -- "${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}") -- -- set(GTEST_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -- -DCMAKE_INSTALL_PREFIX=${GTEST_PREFIX} -- -DCMAKE_CXX_FLAGS=${GTEST_CMAKE_CXX_FLAGS}) -- -- if (MSVC AND NOT PARQUET_USE_STATIC_CRT) -- set(GTEST_CMAKE_ARGS ${GTEST_CMAKE_ARGS} -Dgtest_force_shared_crt=ON) -- endif() -- -- ExternalProject_Add(googletest_ep -- URL "https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz" -- BUILD_BYPRODUCTS "${GTEST_STATIC_LIB}" "${GTEST_MAIN_STATIC_LIB}" -- CMAKE_ARGS ${GTEST_CMAKE_ARGS} -- ${EP_LOG_OPTIONS}) -- set(GTEST_VENDORED 1) -- else() -- find_package(GTest REQUIRED) -- set(GTEST_VENDORED 0) -- endif() -+ find_package(GTest REQUIRED) -+ include_directories(SYSTEM ${GTEST_INCLUDE_DIR}) - - message(STATUS "GTest include dir: ${GTEST_INCLUDE_DIR}") - message(STATUS "GTest static library: ${GTEST_STATIC_LIB}") -- include_directories(SYSTEM ${GTEST_INCLUDE_DIR}) -- -- add_library(gtest STATIC IMPORTED) -- set_target_properties(gtest PROPERTIES IMPORTED_LOCATION ${GTEST_STATIC_LIB}) -- -- add_library(gtest_main STATIC IMPORTED) -- set_target_properties(gtest_main PROPERTIES IMPORTED_LOCATION -- ${GTEST_MAIN_STATIC_LIB}) -- -- if(GTEST_VENDORED) -- add_dependencies(gtest googletest_ep) -- add_dependencies(gtest_main googletest_ep) -- endif() - endif() - - ## Google Benchmark diff --git a/ports/parquet/portfile.cmake b/ports/parquet/portfile.cmake index 5a67bf346..593c1e136 100644 --- a/ports/parquet/portfile.cmake +++ b/ports/parquet/portfile.cmake @@ -1,51 +1,2 @@ -include(vcpkg_common_functions) - -if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - message(FATAL_ERROR "Apache Parquet only supports x64") -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO apache/parquet-cpp - REF apache-parquet-cpp-1.4.0 - SHA512 a6c12e39dcae123ae1893f7fc32bae32e32a1943182b1c0c1c2726134ee4fa6470d73a6ff8e3ce312eeb250d7fa35c9b9f3c227a35ba0aa6f873ce3954217bed - HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - "${CMAKE_CURRENT_LIST_DIR}/all.patch" -) - -SET(ENV{GTEST_HOME} ${CURRENT_INSTALLED_DIR}) - -string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" PARQUET_BUILD_SHARED) -string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" PARQUET_BUILD_STATIC) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DTHRIFT_HOME=${CURRENT_INSTALLED_DIR} - -DARROW_HOME=${CURRENT_INSTALLED_DIR} - -DPARQUET_BUILD_STATIC=${PARQUET_BUILD_STATIC} - -DPARQUET_BUILD_SHARED=${PARQUET_BUILD_SHARED} - -DPARQUET_ARROW_LINKAGE=${VCPKG_LIBRARY_LINKAGE} - -DPARQUET_BUILD_TOOLCHAIN=${CURRENT_INSTALLED_DIR} - -DPARQUET_BOOST_USE_SHARED=${PARQUET_BUILD_SHARED} -) - -vcpkg_install_cmake() - -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/parquet RENAME copyright) - -# Put CMake files in the right place -file(INSTALL ${CURRENT_PACKAGES_DIR}/cmake/parquet-cppConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/parquet) -file(INSTALL ${CURRENT_PACKAGES_DIR}/cmake/parquet-cppConfigVersion.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/parquet RENAME parquet-cppConfigVersion-release.cmake) -file(INSTALL ${CURRENT_PACKAGES_DIR}/debug/cmake/parquet-cppConfigVersion.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/parquet RENAME parquet-cppConfigVersion-debug.cmake) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +# The parquet library has been merged into arrow +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/plplot/0001-findwxwidgets-fixes.patch b/ports/plplot/0001-findwxwidgets-fixes.patch new file mode 100644 index 000000000..72b1d6c25 --- /dev/null +++ b/ports/plplot/0001-findwxwidgets-fixes.patch @@ -0,0 +1,59 @@ +diff --git a/cmake/modules/FindwxWidgets.cmake b/cmake/modules/FindwxWidgets.cmake
+index 4d3a2d1..eaaa358 100644
+--- a/cmake/modules/FindwxWidgets.cmake
++++ b/cmake/modules/FindwxWidgets.cmake
+@@ -515,7 +515,16 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+ set(_WX_ARCH _x64)
+ endif()
+ endif()
+- if(BUILD_SHARED_LIBS)
++ if(VCPKG_TARGET_TRIPLET)
++ find_library(wxWidgets_LIB_DIR
++ NAMES
++ wxmsw31ud_core.lib
++ wxmsw31u_core.lib
++ PATHS
++ DOC "Path to wxWidgets libraries"
++ )
++ get_filename_component(wxWidgets_LIB_DIR ${wxWidgets_LIB_DIR} DIRECTORY)
++ elseif(BUILD_SHARED_LIBS)
+ find_path(wxWidgets_LIB_DIR
+ NAMES
+ msw/wx/setup.h
+@@ -571,6 +580,9 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+ set(wxWidgets_DEFINITIONS WXUSINGDLL)
+ DBG_MSG_V("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}")
+ endif()
++ if(VCPKG_TARGET_TRIPLET)
++ set(wxWidgets_DEFINITIONS WXUSINGDLL)
++ endif(VCPKG_TARGET_TRIPLET)
+
+ # Search for available configuration types.
+ foreach(CFG mswunivud mswunivd mswud mswd mswunivu mswuniv mswu msw)
+@@ -582,6 +594,15 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+ endif()
+ endforeach()
+ DBG_MSG_V("WX_CONFIGURATION_LIST=${WX_CONFIGURATION_LIST}")
++
++ if(VCPKG_TARGET_TRIPLET)
++ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
++ set(WX_CONFIGURATION "mswud")
++ else()
++ set(WX_CONFIGURATION "mswu")
++ endif()
++ set(WX_${WX_CONFIGURATION}_FOUND TRUE)
++ endif(VCPKG_TARGET_TRIPLET)
+
+ if(WX_CONFIGURATION)
+ set(wxWidgets_FOUND TRUE)
+@@ -616,7 +637,9 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+ WX_GET_NAME_COMPONENTS(${wxWidgets_CONFIGURATION} UNV UCD DBG)
+
+ # Set wxWidgets lib setup include directory.
+- if(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
++ if(VCPKG_TARGET_TRIPLET)
++ set(wxWidgets_INCLUDE_DIRS "${wxWidgets_ROOT_DIR}/include")
++ elseif(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
+ set(wxWidgets_INCLUDE_DIRS
+ ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION})
+ else()
diff --git a/ports/plplot/0002-wxwidgets-dev-fixes.patch b/ports/plplot/0002-wxwidgets-dev-fixes.patch new file mode 100644 index 000000000..707c64796 --- /dev/null +++ b/ports/plplot/0002-wxwidgets-dev-fixes.patch @@ -0,0 +1,12 @@ +diff --git a/drivers/wxwidgets_dev.cpp b/drivers/wxwidgets_dev.cpp
+index f025bd8..f5881b1 100644
+--- a/drivers/wxwidgets_dev.cpp
++++ b/drivers/wxwidgets_dev.cpp
+@@ -31,6 +31,7 @@
+
+ // Headers needed for Rand
+ #ifdef WIN32
++#define _WINSOCKAPI_
+ // This include must occur before any other include of stdlib.h due to
+ // the #define _CRT_RAND_S
+ #define _CRT_RAND_S
diff --git a/ports/plplot/CONTROL b/ports/plplot/CONTROL index c278778b0..71bdb1a51 100644 --- a/ports/plplot/CONTROL +++ b/ports/plplot/CONTROL @@ -1,5 +1,5 @@ Source: plplot
-Version: 5.13.0-1
+Version: 5.13.0-2
Build-Depends: freetype, zlib, libpng, bzip2
Description: PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer.
diff --git a/ports/plplot/portfile.cmake b/ports/plplot/portfile.cmake index 7b35f0a15..c98c8253b 100644 --- a/ports/plplot/portfile.cmake +++ b/ports/plplot/portfile.cmake @@ -2,26 +2,28 @@ include(vcpkg_common_functions) set(PLPLOT_VERSION 5.13.0)
set(PLPLOT_HASH 1d5cb5da17d4bde6d675585bff1f8dcb581719249a0b2687867e767703f8dab0870e7ea44b9549a497f4ac0141a3cabf6761c49520c0e2b26ffe581468512cbb)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/plplot-${PLPLOT_VERSION})
vcpkg_download_distfile(ARCHIVE
URLS "https://sourceforge.net/projects/plplot/files/plplot/${PLPLOT_VERSION}%20Source/plplot-${PLPLOT_VERSION}.tar.gz/download"
FILENAME "plplot-${PLPLOT_VERSION}.tar.gz"
SHA512 ${PLPLOT_HASH}
)
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
+ REF ${PLPLOT_VERSION}
+ PATCHES
+ "${CMAKE_CURRENT_LIST_DIR}/0001-findwxwidgets-fixes.patch"
+ "${CMAKE_CURRENT_LIST_DIR}/0002-wxwidgets-dev-fixes.patch"
+ "${CMAKE_CURRENT_LIST_DIR}/install-interface-include-directories.patch"
+)
set(BUILD_with_wxwidgets OFF)
if("wxwidgets" IN_LIST FEATURES)
set(BUILD_with_wxwidgets ON)
endif()
-# Patch build scripts
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
- PATCHES "${CMAKE_CURRENT_LIST_DIR}/install-interface-include-directories.patch"
-)
-
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
@@ -32,9 +34,7 @@ vcpkg_configure_cmake( -DPLPLOT_USE_QT5=OFF
-DENABLE_ocaml=OFF
-DPL_DOUBLE=ON
- -DENABLE_wxwidgets=${ENABLE_wxwidgets}
- -DPLD_wxpng=${ENABLE_wxwidgets}
- -DPLD_wxwidgets=${ENABLE_wxwidgets}
+ -DPLD_wxwidgets=${BUILD_with_wxwidgets}
-DENABLE_DYNDRIVERS=OFF
-DDATA_DIR=${CURRENT_PACKAGES_DIR}/share/plplot
OPTIONS_DEBUG
@@ -51,6 +51,8 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/plplot) file(REMOVE
${CURRENT_PACKAGES_DIR}/debug/bin/pltek.exe
${CURRENT_PACKAGES_DIR}/bin/pltek.exe
+ ${CURRENT_PACKAGES_DIR}/debug/bin/wxPLViewer.exe
+ ${CURRENT_PACKAGES_DIR}/bin/wxPLViewer.exe
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL index bcf523665..2013fc194 100644 --- a/ports/qt5-3d/CONTROL +++ b/ports/qt5-3d/CONTROL @@ -1,4 +1,4 @@ Source: qt5-3d -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-3d/portfile.cmake b/ports/qt5-3d/portfile.cmake index e98d4da83..ef9c6a44e 100644 --- a/ports/qt5-3d/portfile.cmake +++ b/ports/qt5-3d/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qt3d 706aa7e9a43d50823e8cd1e4838417a44761d6391ca3f8bae54d371742789ee63ba36e219c0a66ad3957ae0d68ed8e58c13f56a5f151b2d09e2c99e986aea4fe) +qt_modular_library(qt3d 4df1c07d5fce5771779bf8c43f41f97c8135702f606e7d0766bb17f8819057038b0b83366469ffbcef39e36a527a771d6905ae000f37ce67e6cad3a769e28eba) diff --git a/ports/qt5-activeqt/CONTROL b/ports/qt5-activeqt/CONTROL index 2df390330..491702603 100644 --- a/ports/qt5-activeqt/CONTROL +++ b/ports/qt5-activeqt/CONTROL @@ -1,4 +1,4 @@ Source: qt5-activeqt -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 ActiveQt Module - ActiveX components Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-activeqt/portfile.cmake b/ports/qt5-activeqt/portfile.cmake index 6f2e479a9..9af6e19c9 100644 --- a/ports/qt5-activeqt/portfile.cmake +++ b/ports/qt5-activeqt/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtactiveqt 50027f3429a4e9f140e259f228ea46420284a9632bba3ed92b9b44fbc1c168b6b2d039986d6a07e17ae1afff4f0aec3ccfe8a660322449a3258ab251c1910135) +qt_modular_library(qtactiveqt 439ba83a10763b29419d34bac42d11c59964e9d279cbee0faa51198cfbc91ef0fe60b4b96ea516dcdcc9bc6696599d266b406a0d5e9a6e182ca61df67349a11c) #file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-activeqt/platforminputcontexts) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 820137710..fdf74b20c 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,4 +1,4 @@ Source: qt5-base -Version: 5.11.2-1 +Version: 5.12.0 Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl diff --git a/ports/qt5-base/fix-system-freetype.patch b/ports/qt5-base/fix-system-freetype.patch index 88211bc68..d83fc9891 100644 --- a/ports/qt5-base/fix-system-freetype.patch +++ b/ports/qt5-base/fix-system-freetype.patch @@ -1,12 +1,17 @@ +--- + src/gui/configure.json | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + diff --git a/src/gui/configure.json b/src/gui/configure.json -index 28c8034..4c7c0a7 100644 +index 0332631e..bd64b7b1 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -157,7 +157,7 @@ +@@ -164,8 +164,7 @@ }, "sources": [ { "type": "pkgConfig", "args": "freetype2" }, -- { "type": "freetype", "libs": "-lfreetype" } +- { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" }, +- { "type": "freetype", "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" } + { "libs": "-lfreetype" } ] }, diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index b6d140f88..79b7f763d 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -11,14 +11,14 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) include(configure_qt) include(install_qt) -set(MAJOR_MINOR 5.11) -set(FULL_VERSION ${MAJOR_MINOR}.2) +set(MAJOR_MINOR 5.12) +set(FULL_VERSION ${MAJOR_MINOR}.0) set(ARCHIVE_NAME "qtbase-everywhere-src-${FULL_VERSION}.tar.xz") vcpkg_download_distfile(ARCHIVE_FILE URLS "http://download.qt.io/official_releases/qt/${MAJOR_MINOR}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" FILENAME ${ARCHIVE_NAME} - SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835 + SHA512 8e6c51b754840d17e694b5b4a0d732afe04ebe48d166bca429db01ce3ac9014bb0ed35fe99ad165973889d96919f6b6774429585bae9a7fdba6b07f4c1eb3570 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH @@ -79,13 +79,14 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore ${CORE_OPTIONS} -mp -opengl desktop # other options are "-no-opengl", "-opengl angle", and "-opengl desktop" - LIBJPEG_LIBS="-ljpeg" OPTIONS_RELEASE + LIBJPEG_LIBS="-ljpeg" ZLIB_LIBS="-lzlib" LIBPNG_LIBS="-llibpng16" FREETYPE_LIBS="-lfreetype" PSQL_LIBS="-llibpq" OPTIONS_DEBUG + LIBJPEG_LIBS="-ljpegd" ZLIB_LIBS="-lzlibd" LIBPNG_LIBS="-llibpng16d" PSQL_LIBS="-llibpqd" @@ -100,8 +101,8 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") ${CORE_OPTIONS} -no-sqlite -no-opengl # other options are "-no-opengl", "-opengl angle", and "-opengl desktop" - LIBJPEG_LIBS="-ljpeg" OPTIONS_RELEASE + "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/lib/libjpeg.a" "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libpng16.a" "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/lib/libz.a" "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/lib/libz.a" @@ -109,6 +110,7 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") "FREETYPE_LIBS=${CURRENT_INSTALLED_DIR}/lib/libfreetype.a" "PSQL_LIBS=${CURRENT_INSTALLED_DIR}/lib/libpq.a ${CURRENT_INSTALLED_DIR}/lib/libssl.a ${CURRENT_INSTALLED_DIR}/lib/libcrypto.a" OPTIONS_DEBUG + "LIBJPEG_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libjpeg.a" "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.a" "QMAKE_LIBS_PRIVATE+=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a" "ZLIB_LIBS=${CURRENT_INSTALLED_DIR}/debug/lib/libz.a" diff --git a/ports/qt5-charts/CONTROL b/ports/qt5-charts/CONTROL index 4a73bcdc4..a682fb982 100644 --- a/ports/qt5-charts/CONTROL +++ b/ports/qt5-charts/CONTROL @@ -1,4 +1,4 @@ Source: qt5-charts -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-charts/portfile.cmake b/ports/qt5-charts/portfile.cmake index fdf59fe17..6ce32435e 100644 --- a/ports/qt5-charts/portfile.cmake +++ b/ports/qt5-charts/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtcharts 19a9a0d78cba75d7ed237647c04237797b6002f9c6a4a08f4d4a90426bd44bdbde3f4ffc78dfafab3abb56faaef458a2577f5249200ad89e125e86049aafb85d) +qt_modular_library(qtcharts f8767dc019cf0b9a983e4fd61ac983184d7f4d3ad3cb748fc26a877892d537808eafc3f18815ba06761818e0fe5a74f0a048772fdac9ce86d7290a078f5e21aa) diff --git a/ports/qt5-datavis3d/CONTROL b/ports/qt5-datavis3d/CONTROL index 34842f14d..54d6eb7f6 100644 --- a/ports/qt5-datavis3d/CONTROL +++ b/ports/qt5-datavis3d/CONTROL @@ -1,4 +1,4 @@ Source: qt5-datavis3d -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-datavis3d/portfile.cmake b/ports/qt5-datavis3d/portfile.cmake index a74f82cd7..0b5430177 100644 --- a/ports/qt5-datavis3d/portfile.cmake +++ b/ports/qt5-datavis3d/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtdatavis3d ec5599d95e30a9d6b4fbed53087aed4607a4ad5f8322610ec785c970a0c65b215344ec842c6c21791f27ec015610fca47e6af2608f2682ac2e6d114b0f0b80a8) +qt_modular_library(qtdatavis3d 6b88551e5ada11333a2202598d2c3732dccafafbf0dd7f245dee103137ca0bd3b547b47d3e6dd6929610764f520baa75cd92bf986493fcd57c7ce61e7d419204) diff --git a/ports/qt5-declarative/CONTROL b/ports/qt5-declarative/CONTROL index 9de065478..e16026069 100644 --- a/ports/qt5-declarative/CONTROL +++ b/ports/qt5-declarative/CONTROL @@ -1,4 +1,4 @@ Source: qt5-declarative -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol. Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake index 7949ba8f8..8999aebb6 100644 --- a/ports/qt5-declarative/portfile.cmake +++ b/ports/qt5-declarative/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtdeclarative 30d3ddfabceaf48666cb5ebc5c3a25318152daeed599b1a0a1b3c2feff353708de4760472babbe55a685582c0640a2789fa2fa239d151d17fe2b36950836f7ee) +qt_modular_library(qtdeclarative 858d33bfcd5b87904bb08e0fec04665d3f43ed84de4f4336f4ef4ad2f2bd6d4ea79c048c8f8f8adfd4c30d6a9e01cd46175dc0e5a1335a000c57c0d0058999bd) -#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/platforminputcontexts)
\ No newline at end of file +#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/platforminputcontexts) diff --git a/ports/qt5-gamepad/CONTROL b/ports/qt5-gamepad/CONTROL index 68927e58c..bf323df72 100644 --- a/ports/qt5-gamepad/CONTROL +++ b/ports/qt5-gamepad/CONTROL @@ -1,4 +1,4 @@ Source: qt5-gamepad -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-gamepad/portfile.cmake b/ports/qt5-gamepad/portfile.cmake index 9e97d17ea..fe7f260c1 100644 --- a/ports/qt5-gamepad/portfile.cmake +++ b/ports/qt5-gamepad/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtgamepad 65200780a7a27ca6fd6bd624b38c6568eacc2209816b3214ac2b63b5e510613cd492f846b5f67922aa5605eab1064e3e6ff060b610519e0546a0005736f55274) +qt_modular_library(qtgamepad bf412012b270b1fc594a8f139e5343f45d8b989cbc2d5eb02eb1c06817dd7ffd36706b14e3fa7691e4b4554b56c05e42899d28e278b1f1e0ca278842f46b8cfa) diff --git a/ports/qt5-graphicaleffects/CONTROL b/ports/qt5-graphicaleffects/CONTROL index f8c7d27cd..73f051121 100644 --- a/ports/qt5-graphicaleffects/CONTROL +++ b/ports/qt5-graphicaleffects/CONTROL @@ -1,4 +1,4 @@ Source: qt5-graphicaleffects -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 GraphicalEffects Module. -Build-Depends: qt5-modularscripts, qt5-base +Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-graphicaleffects/portfile.cmake b/ports/qt5-graphicaleffects/portfile.cmake index 3b765d796..6c3ff45e3 100644 --- a/ports/qt5-graphicaleffects/portfile.cmake +++ b/ports/qt5-graphicaleffects/portfile.cmake @@ -4,4 +4,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtgraphicaleffects a76bc46e6442fb66d0f99056c527593ff6df1336f24644fc6d265f21c5be3ff9329cdebb8b677b8b29e3a49fc98b90c9a5838a991ae998b81cda21028826071f) +qt_modular_library(qtgraphicaleffects 88545f9f11d5f97aa70b293539aa10b4e87bbf1f585ba57cbf337c0300b2cdad52ab9d25867a663714ae345c21006d10f567fdbb839df235a9faf7f7674a5835) diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL index f8cb675b9..9681cf060 100644 --- a/ports/qt5-imageformats/CONTROL +++ b/ports/qt5-imageformats/CONTROL @@ -1,4 +1,4 @@ Source: qt5-imageformats -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake index b87bebaee..7a3e37749 100644 --- a/ports/qt5-imageformats/portfile.cmake +++ b/ports/qt5-imageformats/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtimageformats 9de3fa9ff8b985a89806ad33ed276454429aada01119d8f36b7d571f01d23c42afd588353fe62d80cf6b9b83b6c91d53ccbf61ed1ec4d66ddc0ce4f5719bdca1) +qt_modular_library(qtimageformats c83cfdb7e2c73c796d57e14c26bcf2b7d7d1b72413d0d0d632747f42748368d3538e2b1b2b896fe9ca2f58dda285b3452db42738911f26bad5413adea36a3f45) set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/qt5-modularscripts/CONTROL b/ports/qt5-modularscripts/CONTROL index 09e07dd08..f738101d7 100644 --- a/ports/qt5-modularscripts/CONTROL +++ b/ports/qt5-modularscripts/CONTROL @@ -1,3 +1,3 @@ Source: qt5-modularscripts -Version: 2018-11-01-1 +Version: 2018-12-17 Description: Vcpkg helpers to package qt5 modules diff --git a/ports/qt5-modularscripts/qt_modular_library.cmake b/ports/qt5-modularscripts/qt_modular_library.cmake index 4066a6b51..34efa6eb9 100644 --- a/ports/qt5-modularscripts/qt_modular_library.cmake +++ b/ports/qt5-modularscripts/qt_modular_library.cmake @@ -8,8 +8,8 @@ function(qt_modular_library NAME HASH) ) endif() - set(MAJOR_MINOR 5.11) - set(FULL_VERSION ${MAJOR_MINOR}.2) + set(MAJOR_MINOR 5.12) + set(FULL_VERSION ${MAJOR_MINOR}.0) set(ARCHIVE_NAME "${NAME}-everywhere-src-${FULL_VERSION}.tar.xz") vcpkg_download_distfile(ARCHIVE_FILE @@ -40,7 +40,7 @@ function(qt_modular_library NAME HASH) string(SUBSTRING "${NATIVE_INSTALLED_DIR}" 2 -1 INSTALLED_DIR_WITHOUT_DRIVE) string(SUBSTRING "${NATIVE_PACKAGES_DIR}" 2 -1 PACKAGES_DIR_WITHOUT_DRIVE) - + #Configure debug+release vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH}) @@ -135,4 +135,4 @@ function(qt_modular_library NAME HASH) endif() file(INSTALL ${LICENSE_PATH} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -endfunction()
\ No newline at end of file +endfunction() diff --git a/ports/qt5-multimedia/CONTROL b/ports/qt5-multimedia/CONTROL index 7c910ee27..c2dacdb53 100644 --- a/ports/qt5-multimedia/CONTROL +++ b/ports/qt5-multimedia/CONTROL @@ -1,4 +1,4 @@ Source: qt5-multimedia -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-multimedia/portfile.cmake b/ports/qt5-multimedia/portfile.cmake index f03f71183..735b53eea 100644 --- a/ports/qt5-multimedia/portfile.cmake +++ b/ports/qt5-multimedia/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtmultimedia f83c57ad35b713118d1d0ba27f78687aefa8f1ccd850be9b78a9c3477e0e9bb5f9a66bf39c2505f81987f0ca7d07dbc3f471d5efb4b9e4c21e41b308fc83040f) +qt_modular_library(qtmultimedia b16e657c73e57a8e5588697fda0e902834df10edd52704edcb7deb74fc45054ff9840344309ba720998d8afa6a5f315ce2bd46393ff8db6492694cfce0543692) diff --git a/ports/qt5-networkauth/CONTROL b/ports/qt5-networkauth/CONTROL index bf8b15e0c..82809ca9c 100644 --- a/ports/qt5-networkauth/CONTROL +++ b/ports/qt5-networkauth/CONTROL @@ -1,4 +1,4 @@ Source: qt5-networkauth -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Network Authorization Module Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-networkauth/portfile.cmake b/ports/qt5-networkauth/portfile.cmake index 2a27d21e9..e144088d6 100644 --- a/ports/qt5-networkauth/portfile.cmake +++ b/ports/qt5-networkauth/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtnetworkauth f723e8af1ab511f090d1830bf42899ec51b4a027a91c58c46179c16c9e635a3c3f51c13faf943936074ad768407824e57161e28d872868daaed6254c15fc852d) +qt_modular_library(qtnetworkauth ae00e338ff4b9b3233c821a28d59e601489554ce882e8a1dc22c0d7903fadbee182e1f9a43c3667b707581d196f5615042b230823e48c71a4f2b5d793183f1de) diff --git a/ports/qt5-quickcontrols/CONTROL b/ports/qt5-quickcontrols/CONTROL index fc4fb902b..e76b8f15b 100644 --- a/ports/qt5-quickcontrols/CONTROL +++ b/ports/qt5-quickcontrols/CONTROL @@ -1,4 +1,4 @@ Source: qt5-quickcontrols -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 QuickControls Module. Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-quickcontrols/portfile.cmake b/ports/qt5-quickcontrols/portfile.cmake index 6b8983cf7..8a93e8947 100644 --- a/ports/qt5-quickcontrols/portfile.cmake +++ b/ports/qt5-quickcontrols/portfile.cmake @@ -4,4 +4,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtquickcontrols 621101df5966d74232edfe0ab1130968cf311a73e020604a4b329b412062599ab5a0f4f95a4d4c2bb6c2f91143485cd760dd6efac573dbd74f787361a99d5d25) +qt_modular_library(qtquickcontrols a2052398c281e81f8a61afe49f262d4feeb4da2593dbec0cc9971e7de6b169b17c1cf2ee7c213b3d5939cc322d4d715a1ce318b031fd4b8a783fac7bae3e37f9) diff --git a/ports/qt5-quickcontrols2/CONTROL b/ports/qt5-quickcontrols2/CONTROL index f13d9df72..f85acbb14 100644 --- a/ports/qt5-quickcontrols2/CONTROL +++ b/ports/qt5-quickcontrols2/CONTROL @@ -1,4 +1,4 @@ Source: qt5-quickcontrols2 -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 QuickControls2 Module. Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-quickcontrols2/portfile.cmake b/ports/qt5-quickcontrols2/portfile.cmake index 7f96cf5a3..5b9dfed4b 100644 --- a/ports/qt5-quickcontrols2/portfile.cmake +++ b/ports/qt5-quickcontrols2/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtquickcontrols2 94e8113feb222b85fa890fc65c59a371e29eb6838c2221b12d795d9809a605478f1c0b35a75b06bc67a02b3827dbb6bc4c4bf3fdd7485ee518cd0e5c409061a6) +qt_modular_library(qtquickcontrols2 e954832787fcb36cc3bab529b5ddf88ffa96d90924b9193a99e524831aff24026c9b278b4f3bb41afb2cc52a89888621637863ad0cda928901d9eb81e49017a5) diff --git a/ports/qt5-script/CONTROL b/ports/qt5-script/CONTROL index 2b49490c9..02a9b88fb 100755 --- a/ports/qt5-script/CONTROL +++ b/ports/qt5-script/CONTROL @@ -1,3 +1,3 @@ Source: qt5-script
-Version: 5.11.2
+Version: 5.12.0
Description:Qt5 Script Module.
diff --git a/ports/qt5-script/portfile.cmake b/ports/qt5-script/portfile.cmake index 9999ad6cf..e6465127d 100755 --- a/ports/qt5-script/portfile.cmake +++ b/ports/qt5-script/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtscript b0b4badc78cdebb3b42fe91104d112afd3bf9d4ead962c58ececa1db3db7fae6d5368f94d940195e2791ebfd09c5d6d5d892e9c4e48d64ec77dd366eddb1ab00)
+qt_modular_library(qtscript f8870208fb0eb35551294739eabe9736a458e79fef1160b836031411b8055df7284339d301f2983c94b3bafeb15919fc575e12541c471655c0db9c0c5d85a087)
diff --git a/ports/qt5-scxml/CONTROL b/ports/qt5-scxml/CONTROL index a00542c74..c3163b420 100644 --- a/ports/qt5-scxml/CONTROL +++ b/ports/qt5-scxml/CONTROL @@ -1,4 +1,4 @@ Source: qt5-scxml -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-scxml/portfile.cmake b/ports/qt5-scxml/portfile.cmake index 7680b6eb0..eb912f98b 100644 --- a/ports/qt5-scxml/portfile.cmake +++ b/ports/qt5-scxml/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtscxml 4175d02224654a6a6b220f52937a22093be8b06e737f5575d4227b9038cb7c227f37eb17b7bb6878c16a34eae342c06e33cb2c356a389137e9f7d15886aa30ab) +qt_modular_library(qtscxml 4a50e6586a452bf0a0e9b40e969d00082c1bc88b50128d8ff211be4f03705e5a5aa3dcee062e9a635f6f520c6b1cbf52b4a68742d0b41409e1d9f650e76dbf49) diff --git a/ports/qt5-serialport/CONTROL b/ports/qt5-serialport/CONTROL index af03e1254..19c7687b5 100644 --- a/ports/qt5-serialport/CONTROL +++ b/ports/qt5-serialport/CONTROL @@ -1,4 +1,4 @@ Source: qt5-serialport -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Serial Port - provides access to hardware and virtual serial ports Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-serialport/portfile.cmake b/ports/qt5-serialport/portfile.cmake index daf037cdb..515535458 100644 --- a/ports/qt5-serialport/portfile.cmake +++ b/ports/qt5-serialport/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtserialport babf89583fc025de511601f608300a01453e06c2eebe51c0d3cad3eb9c8179fa9cf9982690306ffaf7ce0a0abb7174ae0078a1fd36f6a34a2d5277bff9d4ea9d) +qt_modular_library(qtserialport b8004e844cab66a50f5c899af74f22e62dbac23493210d579344d4a9337990da9781c3647662e7f31b132b4c60d7e3de640a9a636ae7c63de253858324e11428) diff --git a/ports/qt5-speech/CONTROL b/ports/qt5-speech/CONTROL index 1f4c2420c..f3c6068d4 100644 --- a/ports/qt5-speech/CONTROL +++ b/ports/qt5-speech/CONTROL @@ -1,4 +1,4 @@ Source: qt5-speech -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Speech Module Build-Depends: qt5-modularscripts, qt5-base, atlmfc (windows) diff --git a/ports/qt5-speech/portfile.cmake b/ports/qt5-speech/portfile.cmake index b1d36265b..2cbd8064a 100644 --- a/ports/qt5-speech/portfile.cmake +++ b/ports/qt5-speech/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtspeech b3e433b308c6c3454e40e7e19a075d1bd181a33ecea9c8f970852251488c12d1227e0b92aaeb6f7f75ac0efcb04bbe22c49562c594d8b9773528a2aaf73f8d02) +qt_modular_library(qtspeech cbc34d2d51ef2cf333dccd0a142198a477187786e743f6322370a197b4bbcba11ef7ce92aa9ea0917cc092f51609e71764ee3e5d356dadd54eaae5783c756887) diff --git a/ports/qt5-svg/CONTROL b/ports/qt5-svg/CONTROL index d88bb1742..320a03df8 100644 --- a/ports/qt5-svg/CONTROL +++ b/ports/qt5-svg/CONTROL @@ -1,4 +1,4 @@ Source: qt5-svg -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 SVG Module - provides classes for displaying the contents of SVG files Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-svg/portfile.cmake b/ports/qt5-svg/portfile.cmake index 0de3de3fd..b528c806f 100644 --- a/ports/qt5-svg/portfile.cmake +++ b/ports/qt5-svg/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtsvg d6b83bc0c4b348f65890fbb4cd4df81828fb1ef88192c13b06dca695fe499d65da6a52ba57ca289aa31f035309f10af90593cd9ee17362219cfd1337cc801c57) +qt_modular_library(qtsvg 571e457dce3b62de5f316ab69fa0a9a9fd6a3ace8b05ae525ad5c82e6784b60f3c06f1ce94c3639c861639740b29d996fda6907ce77b60aeae916788313e0a65) diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL index 81df69267..86d880315 100644 --- a/ports/qt5-tools/CONTROL +++ b/ports/qt5-tools/CONTROL @@ -1,4 +1,4 @@ Source: qt5-tools -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake index 8c7d0c047..1502646d9 100644 --- a/ports/qt5-tools/portfile.cmake +++ b/ports/qt5-tools/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qttools a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5) +qt_modular_library(qttools 90ce900dc64856e994b05dba8a1f2735357d7cc489b0565beb2553c6007e0a53cedf363cbec96d9af325182f5a164eafe10d2d4d180ee72f544bf0fa9dbc671d) -#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-tools/platforminputcontexts)
\ No newline at end of file +#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-tools/platforminputcontexts) diff --git a/ports/qt5-virtualkeyboard/CONTROL b/ports/qt5-virtualkeyboard/CONTROL index ebdb27623..2b2e7d291 100644 --- a/ports/qt5-virtualkeyboard/CONTROL +++ b/ports/qt5-virtualkeyboard/CONTROL @@ -1,4 +1,4 @@ Source: qt5-virtualkeyboard -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-virtualkeyboard/portfile.cmake b/ports/qt5-virtualkeyboard/portfile.cmake index 210997bfc..4b30772a8 100644 --- a/ports/qt5-virtualkeyboard/portfile.cmake +++ b/ports/qt5-virtualkeyboard/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtvirtualkeyboard 1a471a719771c3a07b8d7b524692bdd085eae1787b8e91f523b224c260bc950b514ce88d885bbbe90c1556619bae15c59debfb221ec01042885d71443e046912) +qt_modular_library(qtvirtualkeyboard 984a4d8eb7fd4aaaee956c65e818467be93540769867023f6a9bb8a6d53bab7fe30d372aaa21cc3fb3642b9e6fa672669d4caacfaa0ed7500dcb126ee4be40f8) set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/qt5-websockets/CONTROL b/ports/qt5-websockets/CONTROL index e10c241d0..5feba2a6b 100644 --- a/ports/qt5-websockets/CONTROL +++ b/ports/qt5-websockets/CONTROL @@ -1,4 +1,4 @@ Source: qt5-websockets -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455 Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-websockets/portfile.cmake b/ports/qt5-websockets/portfile.cmake index 67ea215f3..7b949223e 100644 --- a/ports/qt5-websockets/portfile.cmake +++ b/ports/qt5-websockets/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtwebsockets 28fb4442a5e00c1aad8f7d3e9c6828030a76d7e396b1ecc7743925fb3981a2d900df9c25cbeecf3247d8d6a54a11083d979681cff1171bb0b680584e954e8fc3) +qt_modular_library(qtwebsockets 2c176fce2ad92d7c6c23047ea35a7e868d222abaea077f3d1d9e84ff5fccbaa198d1d0583f5686fdc99c71bea9c4a733cf0b718c65262e761e5f07a93452d186) diff --git a/ports/qt5-winextras/CONTROL b/ports/qt5-winextras/CONTROL index 5b9377077..00350de99 100644 --- a/ports/qt5-winextras/CONTROL +++ b/ports/qt5-winextras/CONTROL @@ -1,4 +1,4 @@ Source: qt5-winextras -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Windows Extras Module. Provides platform-specific APIs for Windows. Build-Depends: qt5-modularscripts, qt5-base, atlmfc diff --git a/ports/qt5-winextras/portfile.cmake b/ports/qt5-winextras/portfile.cmake index adc3bdbe1..18e3e40be 100644 --- a/ports/qt5-winextras/portfile.cmake +++ b/ports/qt5-winextras/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtwinextras ac9ca4d188f7dadbdd124321cba39fb159f9225c23ab955c06ff3939080065a5e8f176f34504c59ae5fee602328550487187ed0648e7896dcd6bed698a6b45d8) +qt_modular_library(qtwinextras 37279e56c8317c2303d077d46ccb3780822e0853f9a2b92d3c9566077a977c2322ee46e9eca5f0f417624fe8ea4da03480fb905895dfb6b149a1c98b1caa3707) diff --git a/ports/qt5-xmlpatterns/CONTROL b/ports/qt5-xmlpatterns/CONTROL index 21e0069ab..7cc2504d6 100644 --- a/ports/qt5-xmlpatterns/CONTROL +++ b/ports/qt5-xmlpatterns/CONTROL @@ -1,4 +1,4 @@ Source: qt5-xmlpatterns -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-xmlpatterns/portfile.cmake b/ports/qt5-xmlpatterns/portfile.cmake index 6484f4610..64832816c 100644 --- a/ports/qt5-xmlpatterns/portfile.cmake +++ b/ports/qt5-xmlpatterns/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtxmlpatterns f659de3da93f83a215914a35b32dcd7d585cabae30044e8d512cbf2a29514043b18ad512e18e6de5b99546ddee2475d807f42e51baa46f15488841314372b26f) +qt_modular_library(qtxmlpatterns 9e9fe5d99957a0079eada985d8b9837cee27c0025851d00024951bb12cf23d0fb2483cbf3a39cb4c5a23b9d453e42d667b0434e73d87447d9b4e84a9dca37ece) diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index 9f3ea3778..d4093b323 100644 --- a/ports/qt5/CONTROL +++ b/ports/qt5/CONTROL @@ -1,4 +1,4 @@ Source: qt5 -Version: 5.11.2 +Version: 5.12.0 Description: Qt5 Application Framework -Build-Depends: qt5-base, qt5-charts, qt5-datavis3d, qt5-declarative, qt5-gamepad, qt5-graphicaleffects, qt5-imageformats, qt5-multimedia, qt5-networkauth, qt5-quickcontrols, qt5-quickcontrols2, qt5-scxml, qt5-serialport, qt5-speech, qt5-svg, qt5-tools, qt5-virtualkeyboard, qt5-websockets, qt5-3d, qt5-winextras, qt5-xmlpatterns
\ No newline at end of file +Build-Depends: qt5-3d, qt5-base, qt5-charts, qt5-datavis3d, qt5-declarative, qt5-gamepad, qt5-graphicaleffects, qt5-imageformats, qt5-multimedia, qt5-networkauth, qt5-quickcontrols, qt5-quickcontrols2, qt5-scxml, qt5-serialport, qt5-speech, qt5-svg, qt5-tools, qt5-virtualkeyboard, qt5-websockets, qt5-winextras, qt5-xmlpatterns diff --git a/ports/sciter/CONTROL b/ports/sciter/CONTROL index fb49f7b36..c82708a73 100644 --- a/ports/sciter/CONTROL +++ b/ports/sciter/CONTROL @@ -1,4 +1,4 @@ Source: sciter -Version: 4.2.2 +Version: 4.2.6.9 Description: Sciter is an embeddable HTML/CSS/scripting engine. Maintainer: andrew.fedoniouk@gmail.com, ehysta@gmail.com diff --git a/ports/sciter/portfile.cmake b/ports/sciter/portfile.cmake index 2c5130421..8ae54344e 100644 --- a/ports/sciter/portfile.cmake +++ b/ports/sciter/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) # header-only library set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) -set(SCITER_REVISION 8add927504c84d72833973a659e834081672237f) -set(SCITER_SHA 85aa711b51e7911f62162cf8c3b74e7693c92a02618e074ed24578da56cf7a589e8336a677b21e7359957bcd7357adfb5da54a9fafa12b7f0bee8e480115c84c) +set(SCITER_REVISION c926703b2cce972875e7f6379c525eef66c95986) +set(SCITER_SHA 9a87ce12db9b2ef1e3abce3e475a9413a8a9301bab3d17341c94d4281e3bf616347ba8a4089f756ec38fed311bb4ee9045c8f85d0c40039ed3c0b96413aceeb4) if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) set(SCITER_ARCH 64) diff --git a/ports/selene/CONTROL b/ports/selene/CONTROL index ddf9e22ea..df460687e 100644 --- a/ports/selene/CONTROL +++ b/ports/selene/CONTROL @@ -1,4 +1,4 @@ Source: selene
-Version: 0.1.1
-Description: A C++14 image representation, processing and I/O library.
+Version: 0.2-1
+Description: A C++17 image representation, processing and I/O library.
Build-Depends: zlib, libpng, libjpeg-turbo
diff --git a/ports/selene/portfile.cmake b/ports/selene/portfile.cmake index c292a64d1..e427c99c2 100644 --- a/ports/selene/portfile.cmake +++ b/ports/selene/portfile.cmake @@ -1,34 +1,26 @@ include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/selene-0.1.1)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
- set(SELENE_EXPORT_SYMBOLS TRUE)
-else()
- set(SELENE_EXPORT_SYMBOLS FALSE)
-endif()
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO kmhofmann/selene
- REF v0.1.1
- SHA512 7738c7b803ae6178f0099b2db2148d20edeff01c524e108e724896201800d82d3852a1ab7d0bd697907673d7030c55c81411f77bb957a0ee3811c46d07104c3e
+ REF v0.2
+ SHA512 9ec1c767541cbe0b349302b7db13a55869003a230669636b6bc37de01be833633be0741b80f58109140b9563b7a7f4c6a5b7ab46ecb142688170a47dba24bdc4
HEAD_REF master
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
- OPTIONS
- -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=${SELENE_EXPORT_SYMBOLS}
)
vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/${PORT}")
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/selene")
vcpkg_copy_pdbs()
# Include files should not be duplicated into the /debug/include directory.
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/selene RENAME copyright)
\ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/selene RENAME copyright)
diff --git a/ports/sobjectizer/CONTROL b/ports/sobjectizer/CONTROL index 33dee9141..a0e398e31 100644 --- a/ports/sobjectizer/CONTROL +++ b/ports/sobjectizer/CONTROL @@ -1,3 +1,3 @@ Source: sobjectizer -Version: 5.5.24 +Version: 5.5.24.1 Description: SObjectizer is a C++ in-process message dispatching framework with implementation of Actor Model, Publish-Subscribe Model and CSP-like channels. diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake index c79f5adfa..bf8174bf5 100644 --- a/ports/sobjectizer/portfile.cmake +++ b/ports/sobjectizer/portfile.cmake @@ -1,12 +1,12 @@ include(vcpkg_common_functions) -set(VERSION 5.5.24) +set(VERSION 5.5.24.1) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/so-${VERSION}/dev) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/sobjectizer/files/sobjectizer/SObjectizer%20Core%20v.5.5/so-${VERSION}.zip" FILENAME "so-${VERSION}.zip" - SHA512 d33b5660fb6d7b1182d68069bb86782dd7632071723762875d88dd6d67353f6913b25e0574d87e06b86f472608631f59c3e26dc9c67cda9f8223454ae758b524 + SHA512 a7b8b57626e99588f79e14594dea1cdfe7fea455f01fe4fde9c397b3086c0a9f0c3cb75b531cc8c40a3f38729729ec6764d450ed7fc626ae79e2f2de7cd2a98e ) vcpkg_extract_source_archive(${ARCHIVE}) diff --git a/ports/spdlog/CONTROL b/ports/spdlog/CONTROL index 8ff960a23..6214deb4d 100644 --- a/ports/spdlog/CONTROL +++ b/ports/spdlog/CONTROL @@ -1,4 +1,4 @@ Source: spdlog -Version: 1.2.1 +Version: 1.3.0 Description: Very fast, header only, C++ logging library Build-Depends: fmt diff --git a/ports/spdlog/disable-master-project-check.patch b/ports/spdlog/disable-master-project-check.patch new file mode 100644 index 000000000..69f5882da --- /dev/null +++ b/ports/spdlog/disable-master-project-check.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e1d9656..f8cb60c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,9 +46,9 @@ add_library(spdlog::spdlog ALIAS spdlog) + + # Check if spdlog is being used directly or via add_subdirectory + set(SPDLOG_MASTER_PROJECT OFF) +-if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) +- set(SPDLOG_MASTER_PROJECT ON) +-endif() ++#if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) ++# set(SPDLOG_MASTER_PROJECT ON) ++#endif() + + option(SPDLOG_BUILD_EXAMPLES "Build examples" ${SPDLOG_MASTER_PROJECT}) + option(SPDLOG_BUILD_BENCH "Build benchmarks" ${SPDLOG_MASTER_PROJECT}) diff --git a/ports/spdlog/fmt-external-cmake-option.patch b/ports/spdlog/fmt-external-cmake-option.patch deleted file mode 100644 index 635eb3b23..000000000 --- a/ports/spdlog/fmt-external-cmake-option.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fc75346..5b3a5c8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,6 +59,12 @@ cmake_dependent_option(SPDLOG_BUILD_TESTING - "BUILD_TESTING" OFF - ) - -+option(SPDLOG_FMT_EXTERNAL "Use external fmt library instead of bundled" OFF) -+ -+if(SPDLOG_FMT_EXTERNAL) -+ find_package(fmt REQUIRED CONFIG) -+endif() -+ - target_include_directories( - spdlog - INTERFACE -@@ -66,6 +72,11 @@ target_include_directories( - "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>" - ) - -+if(SPDLOG_FMT_EXTERNAL) -+ target_compile_definitions(spdlog INTERFACE SPDLOG_FMT_EXTERNAL) -+ target_link_libraries(spdlog INTERFACE fmt::fmt) -+endif() -+ - set(HEADER_BASE "${CMAKE_CURRENT_SOURCE_DIR}/include") - - if(SPDLOG_BUILD_EXAMPLES) -@@ -88,7 +99,8 @@ set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") - set(include_install_dir "${CMAKE_INSTALL_INCLUDEDIR}") - set(pkgconfig_install_dir "${CMAKE_INSTALL_LIBDIR}/pkgconfig") - set(version_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake") --set(project_config "${PROJECT_NAME}Config.cmake") -+set(project_config "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake") -+set(targets_config "${PROJECT_NAME}Targets.cmake") - set(pkg_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc") - set(targets_export_name "${PROJECT_NAME}Targets") - set(namespace "${PROJECT_NAME}::") -@@ -101,6 +113,8 @@ write_basic_package_version_file( - - # configure pkg config file - configure_file("cmake/spdlog.pc.in" "${pkg_config}" @ONLY) -+# configure spdlogConfig.cmake file -+configure_file("cmake/Config.cmake.in" "${project_config}" @ONLY) - - # install targets - install( -@@ -114,9 +128,9 @@ install( - DESTINATION "${include_install_dir}" - ) - --# install project version file -+# install project config and version file - install( -- FILES "${version_config}" -+ FILES "${project_config}" "${version_config}" - DESTINATION "${config_install_dir}" - ) - -@@ -126,19 +140,19 @@ install( - DESTINATION "${pkgconfig_install_dir}" - ) - --# install project config file -+# install targets config file - install( - EXPORT "${targets_export_name}" - NAMESPACE "${namespace}" - DESTINATION "${config_install_dir}" -- FILE ${project_config} -+ FILE ${targets_config} - ) - --# export build directory config file -+# export build directory targets file - export( - EXPORT ${targets_export_name} - NAMESPACE "${namespace}" -- FILE ${project_config} -+ FILE ${targets_config} - ) - - # register project in CMake user registry -diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in -index ba0b36f..0b0fd11 100644 ---- a/cmake/Config.cmake.in -+++ b/cmake/Config.cmake.in -@@ -21,4 +21,11 @@ - # * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
- # *************************************************************************/
-
-+set(SPDLOG_FMT_EXTERNAL @SPDLOG_FMT_EXTERNAL@)
-+
- include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")
-+
-+if(SPDLOG_FMT_EXTERNAL)
-+ include(CMakeFindDependencyMacro)
-+ find_dependency(fmt CONFIG)
-+endif()
diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index c676c6467..ccc961b18 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -3,18 +3,17 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gabime/spdlog - REF v1.2.1 - SHA512 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1 + REF v1.3.0 + SHA512 019a52d4b6c66287ee2a6e8177457ecbbb78e1cb894f4a0a90b83a84d66cd37b397cdf77892d9116e4c34113bd3277d606d578bc96ec6521ae7745f08b1aa54f HEAD_REF v1.x PATCHES - fmt-external-cmake-option.patch # This patch is in the upstream project and can be removed next version update. + disable-master-project-check.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DSPDLOG_BUILD_TESTING=OFF -DSPDLOG_FMT_EXTERNAL=ON ) diff --git a/ports/tinyexif/CONTROL b/ports/tinyexif/CONTROL index ce7162ae9..8302333d5 100644 --- a/ports/tinyexif/CONTROL +++ b/ports/tinyexif/CONTROL @@ -1,4 +1,4 @@ Source: tinyexif -Version: 1.0.1-2 +Version: 1.0.2-4 Build-Depends: tinyxml2 Description: tiny ISO-compliant C++ EXIF and XMP parsing library for JPEG images diff --git a/ports/tinyexif/namespace_tinyxml2.patch b/ports/tinyexif/namespace_tinyxml2.patch deleted file mode 100644 index d27c99c68..000000000 --- a/ports/tinyexif/namespace_tinyxml2.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f22584b..1ba8329 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -84,7 +84,7 @@ if(BUILD_SHARED_LIBS) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251") # needs to have dll-interface - endif() - -- target_link_libraries(TinyEXIF tinyxml2) -+ target_link_libraries(TinyEXIF tinyxml2::tinyxml2) - set_target_properties(TinyEXIF PROPERTIES - COMPILE_DEFINITIONS "TINYEXIF_EXPORT" - VERSION "${GENERIC_LIB_VERSION}" -@@ -121,7 +121,7 @@ endif() - if(BUILD_STATIC_LIBS) - add_library(TinyEXIFstatic STATIC TinyEXIF.cpp TinyEXIF.h) - -- target_link_libraries(TinyEXIFstatic tinyxml2) -+ target_link_libraries(TinyEXIFstatic tinyxml2::tinyxml2) - set_target_properties(TinyEXIFstatic PROPERTIES - OUTPUT_NAME TinyEXIF - VERSION "${GENERIC_LIB_VERSION}" -@@ -162,7 +162,7 @@ if(BUILD_DEMO) - target_compile_definitions(TinyEXIFdemo PRIVATE TINYEXIF_IMPORT) - else(BUILD_STATIC_LIBS) - add_dependencies(TinyEXIFdemo TinyEXIFstatic) -- target_link_libraries(TinyEXIFdemo TinyEXIFstatic tinyxml2) -+ target_link_libraries(TinyEXIFdemo TinyEXIFstatic tinyxml2::tinyxml2) - endif() - endif() - diff --git a/ports/tinyexif/portfile.cmake b/ports/tinyexif/portfile.cmake index 716415453..5a10d422f 100644 --- a/ports/tinyexif/portfile.cmake +++ b/ports/tinyexif/portfile.cmake @@ -3,11 +3,9 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cdcseacave/TinyEXIF - REF 1.0.1 - SHA512 d018d882adbcebf9fa8ad67a78304a1dd21ffd3a01e3cf2d269fa34efedc5ec5f293767f3a21d62cb1bb9b88b2c364977a9125e9b88b2eac7866a8d6b27c2f23 + REF c57a5fec1a847ec0e7b482b2da72e1f04fc2e147 + SHA512 a968e79b4b7a6f5f189328a8dc493da5c0d568526b5dca46b9bfc0cf85295fb348bd0b38828fedbb7b6e4467fc8932d0d7b435b4acbfe662e954cbed1d0ea914 HEAD_REF master - PATCHES - namespace_tinyxml2.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) diff --git a/ports/vxl/portfile.cmake b/ports/vxl/portfile.cmake index 75d89ee2d..9735f144b 100644 --- a/ports/vxl/portfile.cmake +++ b/ports/vxl/portfile.cmake @@ -47,4 +47,5 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/core/vxl_copyright.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file +file(INSTALL ${SOURCE_PATH}/core/vxl_copyright.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +#
\ No newline at end of file diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL index 44b664142..66fda9bee 100644 --- a/ports/x264/CONTROL +++ b/ports/x264/CONTROL @@ -1,3 +1,3 @@ Source: x264 -Version: 157-303c484ec828ed0 +Version: 157-303c484ec828ed0-1 Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format diff --git a/ports/x265/CONTROL b/ports/x265/CONTROL index 87e1867bd..537556763 100644 --- a/ports/x265/CONTROL +++ b/ports/x265/CONTROL @@ -1,3 +1,3 @@ Source: x265 -Version: 2.7-1 +Version: 2.9-1 Description: x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream. diff --git a/ports/x265/disable-install-pdb.patch b/ports/x265/disable-install-pdb.patch index 4601f2728..1b58d287c 100644 --- a/ports/x265/disable-install-pdb.patch +++ b/ports/x265/disable-install-pdb.patch @@ -1,13 +1,22 @@ diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
-index e6d49c6..2409caa 100644
+index 33b6523..06e3193 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
-@@ -546,7 +546,7 @@ if(ENABLE_HDR10_PLUS)
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
- endif()
+@@ -556,13 +556,13 @@ endif()
install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)
--if(WIN32)
-+if(WIN32 AND 0)
+ if((WIN32 AND ENABLE_CLI) OR (WIN32 AND ENABLE_SHARED))
if(MSVC_IDE)
- install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)
- install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)
+- install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)
+- install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)
++ #install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)
++ #install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)
+ install(FILES "${PROJECT_BINARY_DIR}/Debug/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug OPTIONAL NAMELINK_ONLY)
+ install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo OPTIONAL NAMELINK_ONLY)
+ else()
+- install(FILES "${PROJECT_BINARY_DIR}/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)
+- install(FILES "${PROJECT_BINARY_DIR}/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)
++ #install(FILES "${PROJECT_BINARY_DIR}/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)
++ #install(FILES "${PROJECT_BINARY_DIR}/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo)
+ install(FILES "${PROJECT_BINARY_DIR}/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug OPTIONAL NAMELINK_ONLY)
+ install(FILES "${PROJECT_BINARY_DIR}/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo OPTIONAL NAMELINK_ONLY)
+ endif()
diff --git a/ports/x265/portfile.cmake b/ports/x265/portfile.cmake index 0ab99b7d2..090a2db22 100644 --- a/ports/x265/portfile.cmake +++ b/ports/x265/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO multicoreware/x265 - REF 2.7 - SHA512 fd2f43830bbe4fa0ac98ac6d8e3689d0a8a5142da9d67c0dd16fbbde40500c52a370c5c5a30e93195c2e998660a51abab76b09baed87378c9e366cf2f694f2b9 + REF 2.9 + SHA512 5bd9732b6af67e7f7c5b1e71d26acbd98fb98e9e81c6052cda2e1e9254e3eaaa28914805d3f8cd2535dd042022047e54f8ae49ea02269160b609d191a7d99e94 HEAD_REF master ) diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index ed4f7ac29..adbd58ca5 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -53,20 +53,18 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) if(_vam_HOST_ARCHITECTURE STREQUAL "AMD64") set(TOOLSUBPATH msys64) set(URLS - "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20161025.tar.xz" - "https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-base-x86_64-20161025.tar.xz/download" + "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20181211.tar.xz" ) - set(ARCHIVE "msys2-base-x86_64-20161025.tar.xz") - set(HASH 6c4c18ec59db80b8269698d074866438a624f1ce735ee5005a01b148b02e8f2e966ae381aa1cb4c50f6226c3b7feb271e36907cf26580df084d695b3c9f5c0eb) + set(ARCHIVE "msys2-base-x86_64-20181211.tar.xz") + set(HASH 1efb9a7ff1daa2d3147ac0fda8e9a645696dbd19a33c986b844bc037d946dddb3353db5a52794ac668718812854400d918e4db13b4a2d0e6f5a9dfe716b48056) set(STAMP "initialized-msys2_64.stamp") else() set(TOOLSUBPATH msys32) set(URLS - "http://repo.msys2.org/distrib/i686/msys2-base-i686-20161025.tar.xz" - "https://sourceforge.net/projects/msys2/files/Base/i686/msys2-base-i686-20161025.tar.xz/download" + "http://repo.msys2.org/distrib/i686/msys2-base-i686-20181211.tar.xz" ) - set(ARCHIVE "msys2-base-i686-20161025.tar.xz") - set(HASH c9260a38e0c6bf963adeaea098c4e376449c1dd0afe07480741d6583a1ac4c138951ccb0c5388bd148e04255a5c1a23bf5ee2d58dcd6607c14f1eaa5639a7c85) + set(ARCHIVE "msys2-base-i686-20181211.tar.xz") + set(HASH a9b9680a511bb205b87811b303eb29d62e2fd851000304f8b087c5893a3891c2aa2d46217ae989e31b5d52a6ba34ac5e6a5e624d9c917df00a752ade4debc20f) set(STAMP "initialized-msys2_32.stamp") endif() diff --git a/scripts/cmake/vcpkg_build_qmake.cmake b/scripts/cmake/vcpkg_build_qmake.cmake index 189a1113b..947178686 100644 --- a/scripts/cmake/vcpkg_build_qmake.cmake +++ b/scripts/cmake/vcpkg_build_qmake.cmake @@ -51,7 +51,7 @@ function(vcpkg_build_qmake) file(READ "${DEBUG_MAKEFILE}" _contents) string(REPLACE "zlib.lib" "zlibd.lib" _contents "${_contents}") string(REPLACE "installed\\${TARGET_TRIPLET}\\lib" "installed\\${TARGET_TRIPLET}\\debug\\lib" _contents "${_contents}") - string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib qtmaind.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib\\manual-link qtmaind.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib" _contents "${_contents}") + string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib" "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib\\manual-link /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib shell32.lib" _contents "${_contents}") string(REPLACE "tools\\qt5\\qmlcachegen.exe" "tools\\qt5-declarative\\qmlcachegen.exe" _contents "${_contents}") string(REPLACE "tools/qt5/qmlcachegen" "tools/qt5-declarative/qmlcachegen" _contents "${_contents}") string(REPLACE "debug\\lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}") @@ -72,7 +72,7 @@ function(vcpkg_build_qmake) foreach(RELEASE_MAKEFILE ${RELEASE_MAKEFILES}) file(READ "${RELEASE_MAKEFILE}" _contents) - string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib qtmain.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib\\manual-link qtmain.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib" _contents "${_contents}") + string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib" "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib\\manual-link /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib shell32.lib" _contents "${_contents}") string(REPLACE "tools\\qt5\\qmlcachegen.exe" "tools\\qt5-declarative\\qmlcachegen.exe" _contents "${_contents}") string(REPLACE "tools/qt5/qmlcachegen" "tools/qt5-declarative/qmlcachegen" _contents "${_contents}") string(REPLACE "debug\\lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}") |