From 0ea0c917908f5f65025fbf91da246cf17c66dda5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Matte?= Date: Fri, 15 Mar 2019 14:44:28 -0400 Subject: [PATCH 01/23] [sqlpp11] Moved the python scripts located in the bin folder to a separate folder. This removes the warning when compiling in static. --- ports/sqlpp11/portfile.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/sqlpp11/portfile.cmake b/ports/sqlpp11/portfile.cmake index 61b930da5a..be99572e33 100644 --- a/ports/sqlpp11/portfile.cmake +++ b/ports/sqlpp11/portfile.cmake @@ -24,5 +24,9 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) # Delete redundant and unnecessary directories file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +# Move python script from bin directory +file(COPY ${CURRENT_PACKAGES_DIR}/bin/sqlpp11-ddl2cpp DESTINATION ${CURRENT_PACKAGES_DIR}/scripts) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/) + # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlpp11 RENAME copyright) From 5d0808c18cc706b4be5a78dc71bad4aebed13851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Matte?= Date: Fri, 15 Mar 2019 14:44:36 -0400 Subject: [PATCH 02/23] [sqlpp11-connector-mysql] Removed the include files in the debug/include directory which was preventing compilation of this package. --- ports/sqlpp11-connector-mysql/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/sqlpp11-connector-mysql/portfile.cmake b/ports/sqlpp11-connector-mysql/portfile.cmake index 37b8ca147d..fbaaebaf1c 100644 --- a/ports/sqlpp11-connector-mysql/portfile.cmake +++ b/ports/sqlpp11-connector-mysql/portfile.cmake @@ -22,5 +22,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlpp11-connector-mysql RENAME copyright) From 8a35867b738098745981d67729e955930603252a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Matte?= Date: Fri, 15 Mar 2019 14:44:44 -0400 Subject: [PATCH 03/23] [sqlpp11-connector-sqlite3] Removed the include files in the debug/include directory which was preventing compilation of this package. --- ports/sqlpp11-connector-sqlite3/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/sqlpp11-connector-sqlite3/portfile.cmake b/ports/sqlpp11-connector-sqlite3/portfile.cmake index 6937abff22..735912a863 100644 --- a/ports/sqlpp11-connector-sqlite3/portfile.cmake +++ b/ports/sqlpp11-connector-sqlite3/portfile.cmake @@ -20,5 +20,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlpp11-connector-sqlite3 RENAME copyright) From d61392b3ae23291465945cc728913d5089c6359d Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Sat, 16 Mar 2019 00:39:46 -0400 Subject: [PATCH 04/23] [glslang] Properly fixup cmake targets --- ports/glslang/portfile.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index f2ec0e3cda..77e15052d1 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -20,8 +20,10 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_fixup_cmake_targets() + file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools") +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") From dcd9f41388cab5a7c7cb29d41f8502fd1187eff1 Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Sun, 17 Mar 2019 20:05:57 -0400 Subject: [PATCH 05/23] [cppfs] Fix debug exports (#5708) --- ports/cppfs/cmake-export-fix.patch | 46 ++++++++++++++++++++++++++++++ ports/cppfs/portfile.cmake | 3 ++ 2 files changed, 49 insertions(+) create mode 100644 ports/cppfs/cmake-export-fix.patch diff --git a/ports/cppfs/cmake-export-fix.patch b/ports/cppfs/cmake-export-fix.patch new file mode 100644 index 0000000000..3447000024 --- /dev/null +++ b/ports/cppfs/cmake-export-fix.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ea9fd15..c62c6fd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -124,7 +124,7 @@ endif() + if((UNIX AND SYSTEM_DIR_INSTALL) OR OPTION_FORCE_SYSTEM_DIR_INSTALL) + # Install into the system (/usr/bin or /usr/local/bin) + set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/ +- set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share//cmake ++ set(INSTALL_CMAKE "share/${project}") # /usr/[local]/share/ + set(INSTALL_EXAMPLES "share/${project}") # /usr/[local]/share/ + set(INSTALL_DATA "share/${project}") # /usr/[local]/share/ + set(INSTALL_BIN "bin") # /usr/[local]/bin +@@ -183,7 +183,7 @@ add_subdirectory(deploy) + install(FILES "${PROJECT_BINARY_DIR}/VERSION" DESTINATION ${INSTALL_ROOT} COMPONENT runtime) + + # Install cmake find script for the project +-install(FILES ${META_PROJECT_NAME}-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev) ++# install(FILES ${META_PROJECT_NAME}-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev) + + # Install the project meta files + install(FILES AUTHORS DESTINATION ${INSTALL_ROOT} COMPONENT runtime) +diff --git a/source/cppfs/CMakeLists.txt b/source/cppfs/CMakeLists.txt +index aa37eda..e8a59e0 100644 +--- a/source/cppfs/CMakeLists.txt ++++ b/source/cppfs/CMakeLists.txt +@@ -283,7 +283,7 @@ perform_health_checks( + + # Library + install(TARGETS ${target} +- EXPORT "${target}-export" COMPONENT dev ++ EXPORT "${target}-config" COMPONENT dev + RUNTIME DESTINATION ${INSTALL_BIN} COMPONENT runtime + LIBRARY DESTINATION ${INSTALL_SHARED} COMPONENT runtime + ARCHIVE DESTINATION ${INSTALL_LIB} COMPONENT dev +@@ -302,8 +302,8 @@ install(DIRECTORY + ) + + # CMake config +-install(EXPORT ${target}-export ++install(EXPORT ${target}-config + NAMESPACE ${META_PROJECT_NAME}:: +- DESTINATION ${INSTALL_CMAKE}/${target} ++ DESTINATION ${INSTALL_CMAKE} + COMPONENT dev + ) diff --git a/ports/cppfs/portfile.cmake b/ports/cppfs/portfile.cmake index 9716b6bbe3..33ea7e6053 100644 --- a/ports/cppfs/portfile.cmake +++ b/ports/cppfs/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF master PATCHES LibCrypto-fix.patch + cmake-export-fix.patch ) if(${TARGET_TRIPLET} MATCHES "uwp") @@ -40,6 +41,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppfs RENAME copyright) From 2978d2480fa83bd4c4ea70acd9ecd95206af835c Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Mon, 18 Mar 2019 15:25:21 -0400 Subject: [PATCH 06/23] [mapbox-variant] Fix include install location due to hard-coded paths (#5706) * [mapbox-variant] Fix include install location due to hard-coded paths --- ports/mapbox-variant/CONTROL | 2 +- ports/mapbox-variant/portfile.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mapbox-variant/CONTROL b/ports/mapbox-variant/CONTROL index 8e31ca8562..fad7259118 100644 --- a/ports/mapbox-variant/CONTROL +++ b/ports/mapbox-variant/CONTROL @@ -1,3 +1,3 @@ Source: mapbox-variant -Version: 1.1.6-0f734f0 +Version: 1.1.6-0f734f0-1 Description: C++11/C++14 Variant diff --git a/ports/mapbox-variant/portfile.cmake b/ports/mapbox-variant/portfile.cmake index ec1a443a83..60fdd07a78 100644 --- a/ports/mapbox-variant/portfile.cmake +++ b/ports/mapbox-variant/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_github( ) # Copy header files -file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox-variant FILES_MATCHING PATTERN "*.hpp") +file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox FILES_MATCHING PATTERN "*.hpp") # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/mapbox-variant) From 2fc5b2815eaecf8397415e7f0673c5a5ecc78fcf Mon Sep 17 00:00:00 2001 From: Erwan BERNARD Date: Mon, 18 Mar 2019 20:26:29 +0100 Subject: [PATCH 07/23] [orc] update to 1.5.5 (#4786) * [orc] update to 1.5.3 * [orc] update usage with zstd * [orc] update to 1.5.4 * [orc] update to orc 1.5.5rc1 * [orc] fix static build * [orc] bump to 1.5.5 --- .../0002-fix-executable-output-folder.patch | 13 - ...tch => 0003-dependencies-from-vcpkg.patch} | 325 ++++++++++-------- ports/orc/CONTROL | 4 +- ports/orc/portfile.cmake | 10 +- ports/orc/usage | 3 +- 5 files changed, 193 insertions(+), 162 deletions(-) delete mode 100644 ports/orc/0002-fix-executable-output-folder.patch rename ports/orc/{0001-dependencies-from-vcpkg.patch => 0003-dependencies-from-vcpkg.patch} (66%) diff --git a/ports/orc/0002-fix-executable-output-folder.patch b/ports/orc/0002-fix-executable-output-folder.patch deleted file mode 100644 index 5fa992dc10..0000000000 --- a/ports/orc/0002-fix-executable-output-folder.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt -index eb6d232..5a99f5c 100644 ---- a/tools/src/CMakeLists.txt -+++ b/tools/src/CMakeLists.txt -@@ -87,4 +87,7 @@ install(TARGETS - orc-contents - orc-metadata - orc-statistics -- DESTINATION bin) -+ orc-scan -+ orc-memory -+ csv-import -+ DESTINATION tools/orc) diff --git a/ports/orc/0001-dependencies-from-vcpkg.patch b/ports/orc/0003-dependencies-from-vcpkg.patch similarity index 66% rename from ports/orc/0001-dependencies-from-vcpkg.patch rename to ports/orc/0003-dependencies-from-vcpkg.patch index 7930bf1488..ae62d9fb0b 100644 --- a/ports/orc/0001-dependencies-from-vcpkg.patch +++ b/ports/orc/0003-dependencies-from-vcpkg.patch @@ -1,141 +1,184 @@ -diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt -index 91c67d5..4377b83 100644 ---- a/c++/src/CMakeLists.txt -+++ b/c++/src/CMakeLists.txt -@@ -197,11 +197,12 @@ endif(BUILD_LIBHDFSPP) - add_library (orc STATIC ${SOURCE_FILES}) - - target_link_libraries (orc -- protobuf -- zlib -- snappy -- lz4 -- ${LIBHDFSPP_LIBRARIES} -+ PUBLIC -+ protobuf::libprotobuf -+ ZLIB::ZLIB -+ Snappy::snappy -+ ${LZ4_STATIC_LIB} -+ ${LIBHDFSPP_LIBRARIES} - ) - - install(TARGETS orc DESTINATION lib) -\ No newline at end of file -diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt -index 015814a..2b55f4e 100644 ---- a/c++/test/CMakeLists.txt -+++ b/c++/test/CMakeLists.txt -@@ -48,10 +48,6 @@ add_executable (orc-test - - target_link_libraries (orc-test - orc -- lz4 -- protobuf -- snappy -- zlib - ${GTEST_LIBRARIES} - ) - -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake -index 0272263..8b79a12 100644 ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -51,8 +51,8 @@ endif () - # ---------------------------------------------------------------------- - # Snappy - --if (NOT "${SNAPPY_HOME}" STREQUAL "") -- find_package (Snappy REQUIRED) -+if (NOT "${SNAPPY_HOME}" STREQUAL "" OR 1) -+ find_package (Snappy CONFIG REQUIRED) - set(SNAPPY_VENDORED FALSE) - else () - set(SNAPPY_HOME "${THIRDPARTY_DIR}/snappy_ep-install") -@@ -70,10 +70,6 @@ else () - set(SNAPPY_VENDORED TRUE) - endif () - --include_directories (SYSTEM ${SNAPPY_INCLUDE_DIR}) --add_library (snappy STATIC IMPORTED) --set_target_properties (snappy PROPERTIES IMPORTED_LOCATION ${SNAPPY_STATIC_LIB}) -- - if (SNAPPY_VENDORED) - add_dependencies (snappy snappy_ep) - if (INSTALL_VENDORED_LIBS) -@@ -85,7 +81,7 @@ endif () - # ---------------------------------------------------------------------- - # ZLIB - --if (NOT "${ZLIB_HOME}" STREQUAL "") -+if (NOT "${ZLIB_HOME}" STREQUAL "" OR 1) - find_package (ZLIB REQUIRED) - set(ZLIB_VENDORED FALSE) - else () -@@ -112,10 +108,6 @@ else () - set(ZLIB_VENDORED TRUE) - endif () - --include_directories (SYSTEM ${ZLIB_INCLUDE_DIR}) --add_library (zlib STATIC IMPORTED) --set_target_properties (zlib PROPERTIES IMPORTED_LOCATION ${ZLIB_STATIC_LIB}) -- - if (ZLIB_VENDORED) - add_dependencies (zlib zlib_ep) - if (INSTALL_VENDORED_LIBS) -@@ -127,8 +119,8 @@ endif () - # ---------------------------------------------------------------------- - # LZ4 - --if (NOT "${LZ4_HOME}" STREQUAL "") -- find_package (LZ4 REQUIRED) -+if (NOT "${LZ4_HOME}" STREQUAL "" OR 1) -+ find_library(LZ4_STATIC_LIB NAMES lz4d lz4) - set(LZ4_VENDORED FALSE) - else () - set(LZ4_PREFIX "${THIRDPARTY_DIR}/lz4_ep-install") -@@ -154,8 +146,6 @@ else () - endif () - - include_directories (SYSTEM ${LZ4_INCLUDE_DIR}) --add_library (lz4 STATIC IMPORTED) --set_target_properties (lz4 PROPERTIES IMPORTED_LOCATION ${LZ4_STATIC_LIB}) - - if (LZ4_VENDORED) - add_dependencies (lz4 lz4_ep) -@@ -230,8 +220,8 @@ endif () - # ---------------------------------------------------------------------- - # Protobuf - --if (NOT "${PROTOBUF_HOME}" STREQUAL "") -- find_package (Protobuf REQUIRED) -+if (NOT "${PROTOBUF_HOME}" STREQUAL "" OR 1) -+ find_package(protobuf CONFIG REQUIRED) - set(PROTOBUF_VENDORED FALSE) - else () - set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install") -@@ -266,13 +256,8 @@ else () - set(PROTOBUF_VENDORED TRUE) - endif () - --include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR}) - --add_library (protobuf STATIC IMPORTED) --set_target_properties (protobuf PROPERTIES IMPORTED_LOCATION ${PROTOBUF_STATIC_LIB}) - --add_library (protoc STATIC IMPORTED) --set_target_properties (protoc PROPERTIES IMPORTED_LOCATION ${PROTOC_STATIC_LIB}) - - if (PROTOBUF_VENDORED) - add_dependencies (protoc protobuf_ep) -diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt -index 667fab4..eb6d232 100644 ---- a/tools/src/CMakeLists.txt -+++ b/tools/src/CMakeLists.txt -@@ -49,7 +49,6 @@ add_executable (orc-metadata - - target_link_libraries (orc-metadata - orc -- protobuf - ) - - add_executable (orc-statistics +diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt +index 235ced8..0042a88 100644 +--- a/c++/src/CMakeLists.txt ++++ b/c++/src/CMakeLists.txt +@@ -218,12 +218,13 @@ endif(BUILD_LIBHDFSPP) + add_library (orc STATIC ${SOURCE_FILES}) + + target_link_libraries (orc +- protobuf +- zlib +- snappy +- lz4 +- zstd +- ${LIBHDFSPP_LIBRARIES} ++ PRIVATE ++ protobuf::libprotobuf ++ ZLIB::ZLIB ++ Snappy::snappy ++ ${LZ4_STATIC_LIB} ++ ${ZSTD_STATIC_LIB} ++ ${LIBHDFSPP_LIBRARIES} + ) + + install(TARGETS orc DESTINATION lib) +diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt +index db68578..709ad07 100644 +--- a/c++/test/CMakeLists.txt ++++ b/c++/test/CMakeLists.txt +@@ -50,10 +50,10 @@ add_executable (orc-test + + target_link_libraries (orc-test + orc +- lz4 +- protobuf +- snappy +- zlib ++ protobuf::libprotobuf ++ ZLIB::ZLIB ++ Snappy::snappy ++ ${LZ4_STATIC_LIB} + ${GTEST_LIBRARIES} + ) + +diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake +index 1a28b1a..89f57d8 100644 +--- a/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cmake_modules/ThirdpartyToolchain.cmake +@@ -59,8 +59,8 @@ endif () + # ---------------------------------------------------------------------- + # Snappy + +-if (NOT "${SNAPPY_HOME}" STREQUAL "") +- find_package (Snappy REQUIRED) ++if (NOT "${SNAPPY_HOME}" STREQUAL "" OR 1) ++ find_package (Snappy CONFIG REQUIRED) + set(SNAPPY_VENDORED FALSE) + else () + set(SNAPPY_HOME "${THIRDPARTY_DIR}/snappy_ep-install") +@@ -78,10 +78,6 @@ else () + set(SNAPPY_VENDORED TRUE) + endif () + +-include_directories (SYSTEM ${SNAPPY_INCLUDE_DIR}) +-add_library (snappy STATIC IMPORTED) +-set_target_properties (snappy PROPERTIES IMPORTED_LOCATION ${SNAPPY_STATIC_LIB}) +- + if (SNAPPY_VENDORED) + add_dependencies (snappy snappy_ep) + if (INSTALL_VENDORED_LIBS) +@@ -93,7 +89,8 @@ endif () + # ---------------------------------------------------------------------- + # ZLIB + +-if (NOT "${ZLIB_HOME}" STREQUAL "") ++ ++if (NOT "${ZLIB_HOME}" STREQUAL "" OR 1) + find_package (ZLIB REQUIRED) + set(ZLIB_VENDORED FALSE) + else () +@@ -120,10 +117,6 @@ else () + set(ZLIB_VENDORED TRUE) + endif () + +-include_directories (SYSTEM ${ZLIB_INCLUDE_DIR}) +-add_library (zlib STATIC IMPORTED) +-set_target_properties (zlib PROPERTIES IMPORTED_LOCATION ${ZLIB_STATIC_LIB}) +- + if (ZLIB_VENDORED) + add_dependencies (zlib zlib_ep) + if (INSTALL_VENDORED_LIBS) +@@ -134,9 +127,8 @@ endif () + + # ---------------------------------------------------------------------- + # Zstd +- +-if (NOT "${ZSTD_HOME}" STREQUAL "") +- find_package (zstd REQUIRED) ++if (NOT "${ZSTD_HOME}" STREQUAL "" OR 1) ++ find_library(ZSTD_STATIC_LIB NAMES zstd zstd_static) + set(ZSTD_VENDORED FALSE) + else () + set(ZSTD_HOME "${THIRDPARTY_DIR}/zstd_ep-install") +@@ -169,10 +161,6 @@ else () + set(ZSTD_VENDORED TRUE) + endif () + +-include_directories (SYSTEM ${ZSTD_INCLUDE_DIR}) +-add_library (zstd STATIC IMPORTED) +-set_target_properties (zstd PROPERTIES IMPORTED_LOCATION ${ZSTD_STATIC_LIB}) +- + if (ZSTD_VENDORED) + add_dependencies (zstd zstd_ep) + if (INSTALL_VENDORED_LIBS) +@@ -183,9 +171,8 @@ endif () + + # ---------------------------------------------------------------------- + # LZ4 +- +-if (NOT "${LZ4_HOME}" STREQUAL "") +- find_package (LZ4 REQUIRED) ++if (NOT "${LZ4_HOME}" STREQUAL "" OR 1) ++ find_library(LZ4_STATIC_LIB NAMES lz4d lz4) + set(LZ4_VENDORED FALSE) + else () + set(LZ4_PREFIX "${THIRDPARTY_DIR}/lz4_ep-install") +@@ -211,10 +198,6 @@ else () + set(LZ4_VENDORED TRUE) + endif () + +-include_directories (SYSTEM ${LZ4_INCLUDE_DIR}) +-add_library (lz4 STATIC IMPORTED) +-set_target_properties (lz4 PROPERTIES IMPORTED_LOCATION ${LZ4_STATIC_LIB}) +- + if (LZ4_VENDORED) + add_dependencies (lz4 lz4_ep) + if (INSTALL_VENDORED_LIBS) +@@ -287,9 +270,8 @@ endif () + + # ---------------------------------------------------------------------- + # Protobuf +- +-if (NOT "${PROTOBUF_HOME}" STREQUAL "") +- find_package (Protobuf REQUIRED) ++if (NOT "${PROTOBUF_HOME}" STREQUAL "" OR 1) ++ find_package (protobuf CONFIG REQUIRED) + set(PROTOBUF_VENDORED FALSE) + else () + set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install") +@@ -325,14 +307,6 @@ else () + set(PROTOBUF_VENDORED TRUE) + endif () + +-include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR}) +- +-add_library (protobuf STATIC IMPORTED) +-set_target_properties (protobuf PROPERTIES IMPORTED_LOCATION ${PROTOBUF_STATIC_LIB}) +- +-add_library (protoc STATIC IMPORTED) +-set_target_properties (protoc PROPERTIES IMPORTED_LOCATION ${PROTOC_STATIC_LIB}) +- + if (PROTOBUF_VENDORED) + add_dependencies (protoc protobuf_ep) + add_dependencies (protobuf protobuf_ep) +diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt +index f5a53ca..15391bf 100644 +--- a/tools/src/CMakeLists.txt ++++ b/tools/src/CMakeLists.txt +@@ -51,7 +51,6 @@ add_executable (orc-metadata + + target_link_libraries (orc-metadata + orc +- protobuf + ${CMAKE_THREAD_LIBS_INIT} + ) + +@@ -95,4 +94,7 @@ install(TARGETS + orc-contents + orc-metadata + orc-statistics +- DESTINATION bin) ++ orc-scan ++ orc-memory ++ csv-import ++ DESTINATION tools/orc) diff --git a/ports/orc/CONTROL b/ports/orc/CONTROL index 45532cad31..1cb8967ed6 100644 --- a/ports/orc/CONTROL +++ b/ports/orc/CONTROL @@ -1,4 +1,4 @@ Source: orc -Version: 1.5.2-f47e02c-2 -Build-Depends: zlib, protobuf, lz4, snappy, gtest +Version: 1.5.5 +Build-Depends: zlib, protobuf, lz4, snappy, zstd, gtest Description: The smallest, fastest columnar storage for Hadoop workloads. diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake index f9a23b7085..e72f9fd699 100644 --- a/ports/orc/portfile.cmake +++ b/ports/orc/portfile.cmake @@ -3,16 +3,16 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/orc - REF f47e02cfbf346f14d7f38c3ddd45d39e3b515847 - SHA512 5a389f4ab3b0ce4e7c8869493cf9e91feb4917a42bf2740abd71602fa03a2a53217b572e60af7328b7568dab084c07275ea275438ec8ae87f230a87fb60f2601 + REF 47a490f083bd411bf04bfed8131eef42606d7789 + SHA512 c2650d9fd367a5ec04c79c16434728e5c20608131f21bfc89d412cbaf8dd4ae5900b03e59df21d3617d8c6a9504e4b14b1f788157afa90b57d733499d2995e39 HEAD_REF master PATCHES - 0001-dependencies-from-vcpkg.patch - 0002-fix-executable-output-folder.patch -) + 0003-dependencies-from-vcpkg.patch + ) file(REMOVE "${SOURCE_PATH}/cmake_modules/FindGTest.cmake") file(REMOVE "${SOURCE_PATH}/cmake_modules/FindLZ4.cmake") +file(REMOVE "${SOURCE_PATH}/cmake_modules/FindZSTD.cmake") file(REMOVE "${SOURCE_PATH}/cmake_modules/FindProtobuf.cmake") file(REMOVE "${SOURCE_PATH}/cmake_modules/FindSnappy.cmake") file(REMOVE "${SOURCE_PATH}/cmake_modules/FindZLIB.cmake") diff --git a/ports/orc/usage b/ports/orc/usage index 6a20ccb896..b364b8bfea 100644 --- a/ports/orc/usage +++ b/ports/orc/usage @@ -5,6 +5,7 @@ The package orc does not provide CMake targets: find_package(Snappy CONFIG REQUIRED) find_library(LZ4_LIBRARY NAMES lz4d lz4) + find_library(ZSTD_LIBRARY NAMES zstd) find_library(ORC_LIBRARY NAMES orc) - target_link_libraries(main PRIVATE ${ORC_LIBRARY} protobuf::libprotoc protobuf::libprotobuf Snappy::snappy ${LZ4_LIBRARY} ZLIB::ZLIB) + target_link_libraries(main PRIVATE ${ORC_LIBRARY} protobuf::libprotoc protobuf::libprotobuf Snappy::snappy ${LZ4_LIBRARY} ${ZSTD_LIBRARY} ZLIB::ZLIB) From aed7d2e2146b26edc9943d650f391ef2407e5a54 Mon Sep 17 00:00:00 2001 From: MouhammadEV <38284341+MouhammadEV@users.noreply.github.com> Date: Mon, 18 Mar 2019 20:33:45 +0100 Subject: [PATCH 08/23] [WIP][vtk] add the option -DModule_vtkGUISupportMFC=ON (#4661) * Update portfile.cmake * [vtk] Only enable Module_vtkGUISupportMFC for Windows. Require atlmfc on Windows. --- ports/vtk/CONTROL | 4 ++-- ports/vtk/portfile.cmake | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 7bd4d5b3d9..0d489e677a 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,7 +1,7 @@ Source: vtk -Version: 8.2.0-1 +Version: 8.2.0-2 Description: Software system for 3D computer graphics, image processing, and visualization -Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora +Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, atlmfc (windows) Feature: openvr Description: OpenVR functionality for VTK diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 06773528ee..baff2cb06c 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -115,6 +115,12 @@ if(VTK_WITH_ALL_MODULES) ) endif() +if(NOT VCPKG_CMAKE_SYSTEM_NAME) + set(Module_vtkGUISupportMFC ON) +else() + set(Module_vtkGUISupportMFC OFF) +endif() + # ============================================================================= # Configure & Install if(${VCPKG_LIBRARY_LINKAGE} MATCHES "static") @@ -154,6 +160,7 @@ vcpkg_configure_cmake( -DVTK_INSTALL_PACKAGE_DIR=share/vtk -DVTK_INSTALL_RUNTIME_DIR=bin -DVTK_FORBID_DOWNLOADS=ON + -DModule_vtkGUISupportMFC=${Module_vtkGUISupportMFC} ${ADDITIONAL_OPTIONS} ) From 164c78cab81b6a9b54b2e507183486419d170e5d Mon Sep 17 00:00:00 2001 From: grdowns Date: Mon, 18 Mar 2019 14:27:48 -0700 Subject: [PATCH 09/23] Update version string --- ports/glslang/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/glslang/CONTROL b/ports/glslang/CONTROL index c924828436..8f6bb6de94 100644 --- a/ports/glslang/CONTROL +++ b/ports/glslang/CONTROL @@ -1,3 +1,3 @@ Source: glslang -Version: 2018-03-02-1 +Version: 2018-03-02-2 Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator From 27b1d92ef5bbba004e27bfd11aa8bea1bd9652db Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 19 Mar 2019 05:45:36 +0800 Subject: [PATCH 10/23] [qcustomplot] Add new port (#5036) * [qcustomplot] Add new port * [qt5-base] Trigger a rebuild for qcustomplot * Revert "[qt5-base] Trigger a rebuild for qcustomplot" This reverts commit 1082892d12958a207435310098587306d0f3114b. * [qcustomplot] Trigger rebuild on CI --- ports/qcustomplot/CONTROL | 4 ++ ports/qcustomplot/portfile.cmake | 70 ++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 ports/qcustomplot/CONTROL create mode 100644 ports/qcustomplot/portfile.cmake diff --git a/ports/qcustomplot/CONTROL b/ports/qcustomplot/CONTROL new file mode 100644 index 0000000000..4b82238444 --- /dev/null +++ b/ports/qcustomplot/CONTROL @@ -0,0 +1,4 @@ +Source: qcustomplot +Version: 2.0.1-1 +Description: QCustomPlot is a Qt C++ widget for plotting and data visualization. +Build-Depends: qt5-base diff --git a/ports/qcustomplot/portfile.cmake b/ports/qcustomplot/portfile.cmake new file mode 100644 index 0000000000..1f3385eb28 --- /dev/null +++ b/ports/qcustomplot/portfile.cmake @@ -0,0 +1,70 @@ +include(vcpkg_common_functions) + +set(QCP_VERSION 2.0.1) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.qcustomplot.com/release/${QCP_VERSION}/QCustomPlot.tar.gz" + FILENAME "QCustomPlot-${QCP_VERSION}.tar.gz" + SHA512 a15598718146ed3c6b5d38530a56661c16269e530fe0dedb71b4cb2722b5733a3b57689d668a75994b79c19c6e61dcc133dbcb9ed77b93a165f4ac826a5685b9 +) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${QCP_VERSION} +) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.qcustomplot.com/release/${QCP_VERSION}/QCustomPlot-sharedlib.tar.gz" + FILENAME "QCustomPlot-sharedlib-${QCP_VERSION}.tar.gz" + SHA512 ce90540fca7226eac37746327e1939a9c7af38fc2595f385ed04d6d1f49560da08fb5fae15d1b9d22b6ba578583f70de8f89ef26796770d41bf599c1b15c535d +) +vcpkg_extract_source_archive(${ARCHIVE} ${SOURCE_PATH}) + +vcpkg_configure_qmake(SOURCE_PATH + ${SOURCE_PATH}/qcustomplot-sharedlib/sharedlib-compilation/sharedlib-compilation.pro +) + +vcpkg_build_qmake( + RELEASE_TARGETS release-all + DEBUG_TARGETS debug-all +) + +set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") +set(RELEASE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + +# Install header file +file(INSTALL ${SOURCE_PATH}/qcustomplot.h + DESTINATION ${CURRENT_PACKAGES_DIR}/include +) + +# Install module files +macro(_install_module_file source_dir target_dir filename_regex) + file(GLOB _files ${source_dir}/*) + list(FILTER _files INCLUDE REGEX ${filename_regex}) + file(INSTALL ${_files} DESTINATION ${target_dir}) +endmacro() + +_install_module_file(${DEBUG_DIR}/debug + ${CURRENT_PACKAGES_DIR}/debug/lib + "qcustomplotd[2]*\.(lib|a)$") + +_install_module_file(${RELEASE_DIR}/release + ${CURRENT_PACKAGES_DIR}/lib + "qcustomplot[2]*\.(lib|a)$") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(INSTALL + ${DEBUG_DIR}/debug/qcustomplotd2.dll + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin + ) + + file(INSTALL + ${RELEASE_DIR}/release/qcustomplot2.dll + DESTINATION ${CURRENT_PACKAGES_DIR}/bin + ) +endif() + +vcpkg_copy_pdbs() + +# Handle copyright +configure_file(${SOURCE_PATH}/GPL.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) From 563e085d424fc7b45c5f9e5897ef470b5c1186d8 Mon Sep 17 00:00:00 2001 From: grdowns Date: Mon, 18 Mar 2019 17:47:24 -0700 Subject: [PATCH 11/23] Update version strings --- ports/sqlpp11-connector-mysql/CONTROL | 4 ++-- ports/sqlpp11-connector-sqlite3/CONTROL | 4 ++-- ports/sqlpp11/CONTROL | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/sqlpp11-connector-mysql/CONTROL b/ports/sqlpp11-connector-mysql/CONTROL index 690e9d1abb..e562751376 100644 --- a/ports/sqlpp11-connector-mysql/CONTROL +++ b/ports/sqlpp11-connector-mysql/CONTROL @@ -1,4 +1,4 @@ Source: sqlpp11-connector-mysql -Version: 0.25 +Version: 0.25-1 Description: A C++ wrapper for MySQL meant to be used in combination with sqlpp11. -Build-Depends: date, libmariadb, sqlpp11 \ No newline at end of file +Build-Depends: date, libmariadb, sqlpp11 diff --git a/ports/sqlpp11-connector-sqlite3/CONTROL b/ports/sqlpp11-connector-sqlite3/CONTROL index 35a65250b5..25e680eda8 100644 --- a/ports/sqlpp11-connector-sqlite3/CONTROL +++ b/ports/sqlpp11-connector-sqlite3/CONTROL @@ -1,4 +1,4 @@ Source: sqlpp11-connector-sqlite3 -Version: 0.29 +Version: 0.29-1 Description: A C++ wrapper for sqlite3 meant to be used in combination with sqlpp11. -Build-Depends: date, sqlite3, sqlpp11 \ No newline at end of file +Build-Depends: date, sqlite3, sqlpp11 diff --git a/ports/sqlpp11/CONTROL b/ports/sqlpp11/CONTROL index 7c75d17d96..bd5101f8fc 100644 --- a/ports/sqlpp11/CONTROL +++ b/ports/sqlpp11/CONTROL @@ -1,4 +1,4 @@ Source: sqlpp11 -Version: 0.57 +Version: 0.57-1 Description: A type safe embedded domain specific language for SQL queries and results in C++. -Build-Depends: date \ No newline at end of file +Build-Depends: date From 02511898db381da2f643bc4d4e55fc9bca00214d Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Tue, 19 Mar 2019 00:18:02 -0400 Subject: [PATCH 12/23] [rapidxml-ns] Add new port. (#5703) * [rapidxml-ns] Add new port * [rapidxml] Move headers out of include to prevent conflicts and clutter. * [rapidxml-ns] Update SHA512 * [rapidxml-ns] Fix header installation * [3fd] Fix header issue with rapidxml --- ports/3fd/CONTROL | 2 +- ports/3fd/RapidXML.patch | 13 +++++++++++++ ports/3fd/portfile.cmake | 1 + ports/rapidxml-ns/CONTROL | 3 +++ ports/rapidxml-ns/portfile.cmake | 22 ++++++++++++++++++++++ ports/rapidxml/portfile.cmake | 2 +- 6 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 ports/3fd/RapidXML.patch create mode 100644 ports/rapidxml-ns/CONTROL create mode 100644 ports/rapidxml-ns/portfile.cmake diff --git a/ports/3fd/CONTROL b/ports/3fd/CONTROL index 32e1e5d071..6f278f762d 100644 --- a/ports/3fd/CONTROL +++ b/ports/3fd/CONTROL @@ -1,4 +1,4 @@ Source: 3fd -Version: 2.6.2-1 +Version: 2.6.2-2 Description: C++ Framework For Fast Development Build-Depends: boost-lockfree (windows), boost-regex (windows), poco (windows), sqlite3, rapidxml diff --git a/ports/3fd/RapidXML.patch b/ports/3fd/RapidXML.patch new file mode 100644 index 0000000000..fdb6cd18eb --- /dev/null +++ b/ports/3fd/RapidXML.patch @@ -0,0 +1,13 @@ +diff --git a/3FD/configuration.cpp b/3FD/configuration.cpp +index b9ca804..207a397 100644 +--- a/3FD/configuration.cpp ++++ b/3FD/configuration.cpp +@@ -2,7 +2,7 @@ + #include "configuration.h" + #include "exceptions.h" + #include "utils_io.h" +-#include ++#include + + #ifdef _3FD_PLATFORM_WINRT + # include "utils_winrt.h" diff --git a/ports/3fd/portfile.cmake b/ports/3fd/portfile.cmake index 513bb9a03a..1e7e9d6016 100644 --- a/ports/3fd/portfile.cmake +++ b/ports/3fd/portfile.cmake @@ -32,6 +32,7 @@ vcpkg_from_github( PATCHES "${CMAKE_CURRENT_LIST_DIR}/remove-seekpos.patch" "${CMAKE_CURRENT_LIST_DIR}/DataException.patch" + "${CMAKE_CURRENT_LIST_DIR}/RapidXML.patch" ) # Copy the sources to ensure a clean, out-of-source build diff --git a/ports/rapidxml-ns/CONTROL b/ports/rapidxml-ns/CONTROL new file mode 100644 index 0000000000..1dd1ed5469 --- /dev/null +++ b/ports/rapidxml-ns/CONTROL @@ -0,0 +1,3 @@ +Source: rapidxml-ns +Version: 1.13-04674e3 +Description: RapidXML with added XML namespaces support. diff --git a/ports/rapidxml-ns/portfile.cmake b/ports/rapidxml-ns/portfile.cmake new file mode 100644 index 0000000000..c38d6c4ec3 --- /dev/null +++ b/ports/rapidxml-ns/portfile.cmake @@ -0,0 +1,22 @@ +#header-only library +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO svgpp/rapidxml_ns + REF 04674e33e3bbfeee05875a29a36734667c0f3cfd + SHA512 c82d55ca7ec358427f811689604ba02582de9d7f57d0caa3a96e2c36b9f3751e9acefc6f84348e6c619dacca31880f279bf9d9959f8eff251f3d3276c836bcd2 + HEAD_REF master +) + +# Handle copyright +file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/rapidxml-ns) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/rapidxml-ns/license.txt ${CURRENT_PACKAGES_DIR}/share/rapidxml-ns/copyright) + +# Copy the header files +file(INSTALL + ${SOURCE_PATH}/rapidxml_ns.hpp + ${SOURCE_PATH}/rapidxml_ns_print.hpp + ${SOURCE_PATH}/rapidxml_ns_utils.hpp + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/rapidxml-ns) diff --git a/ports/rapidxml/portfile.cmake b/ports/rapidxml/portfile.cmake index a5f3190d08..dd8f0d4c2f 100644 --- a/ports/rapidxml/portfile.cmake +++ b/ports/rapidxml/portfile.cmake @@ -13,4 +13,4 @@ file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/r file(RENAME ${CURRENT_PACKAGES_DIR}/share/rapidxml/license.txt ${CURRENT_PACKAGES_DIR}/share/rapidxml/copyright) # Copy the header files -file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.hpp") +file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/rapidxml FILES_MATCHING PATTERN "*.hpp") From 2df31838e8e6e0cd334e730e8008345cc16a319a Mon Sep 17 00:00:00 2001 From: Larry-Hu Date: Tue, 19 Mar 2019 03:10:14 -0700 Subject: [PATCH 13/23] [gli]Fix gli is incompatible with glm --- ports/gli/CONTROL | 2 +- ports/gli/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/gli/CONTROL b/ports/gli/CONTROL index b8edac798c..521a791208 100644 --- a/ports/gli/CONTROL +++ b/ports/gli/CONTROL @@ -1,4 +1,4 @@ Source: gli -Version: 0.8.2-1 +Version: dd17acf Build-Depends: glm Description: OpenGL Image (GLI) https://gli.g-truc.net diff --git a/ports/gli/portfile.cmake b/ports/gli/portfile.cmake index 3052336198..beae5e530d 100644 --- a/ports/gli/portfile.cmake +++ b/ports/gli/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO g-truc/gli - REF 0.8.2.0 - SHA512 c254a4e1497d0add985e4a882c552db99c512cc0e9cc72145d51a6e7deada817d624d9818099a47136a8a3ef1223a26a34e355e3c713166f0bb062e506059834 + REF dd17acf9cc7fc6e6abe9f9ec69949eeeee1ccd82 + SHA512 9e3a4ab9ee73d5c271b8346cf81339cd3cd0c20d20991524b816313b6a99e8d3a01863316a38cf1a52ef9c5b31d689ecccf6248b12d1d270460c048bf904650b HEAD_REF master ) From 14bc52eb394fdfbe92778b38cea0755064482bf9 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 19 Mar 2019 20:07:35 +0000 Subject: [PATCH 14/23] Make use of vcpkg_copy_pdbs instead of manually copying the pdb files (#5733) --- ports/ace/CONTROL | 2 +- ports/ace/portfile.cmake | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL index d0f1e62920..cb11cfce58 100644 --- a/ports/ace/CONTROL +++ b/ports/ace/CONTROL @@ -1,3 +1,3 @@ Source: ace -Version: 6.5.4-1 +Version: 6.5.4-2 Description: The ADAPTIVE Communication Environment diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 105cd31aaf..600be9ae0c 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -89,16 +89,6 @@ function(install_ace_library SOURCE_PATH ACE_LIBRARY) ${LIB_PATH}/${ACE_LIBRARY}.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin ) - - # Install the pdb files - file(INSTALL - ${LIB_PATH}/${ACE_LIBRARY}${DLL_DECORATOR}d_dll.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin - ) - file(INSTALL - ${LIB_PATH}/${ACE_LIBRARY}${DLL_DECORATOR}.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/bin - ) endif() # Install the lib files @@ -124,3 +114,5 @@ install_ace_library(${ACE_ROOT} "ACE_RLECompression") # Handle copyright file(COPY ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace) file(RENAME ${CURRENT_PACKAGES_DIR}/share/ace/COPYING ${CURRENT_PACKAGES_DIR}/share/ace/copyright) + +vcpkg_copy_pdbs() \ No newline at end of file From 08882c6740b0d2036757f3105a35627f8ba02b77 Mon Sep 17 00:00:00 2001 From: Jonathan Hale Date: Tue, 19 Mar 2019 21:08:18 +0100 Subject: [PATCH 15/23] [magnum] Update patches (#5730) Signed-off-by: Squareys --- ports/magnum/001-sdl-includes.patch | 28 +++++++++++++++++++------ ports/magnum/003-glfw-find-module.patch | 8 +++---- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/ports/magnum/001-sdl-includes.patch b/ports/magnum/001-sdl-includes.patch index afa1301d91..b7ae6a4461 100644 --- a/ports/magnum/001-sdl-includes.patch +++ b/ports/magnum/001-sdl-includes.patch @@ -1,14 +1,31 @@ +diff --git a/src/Magnum/Platform/Sdl2Application.cpp b/src/Magnum/Platform/Sdl2Application.cpp +index 46ade2d00..24d8eabe7 100644 +--- a/src/Magnum/Platform/Sdl2Application.cpp ++++ b/src/Magnum/Platform/Sdl2Application.cpp +@@ -26,7 +26,7 @@ + #include "Sdl2Application.h" + + #include +-#include ++#include + #ifndef CORRADE_TARGET_EMSCRIPTEN + #include + #else diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h -index 99c3174..311b2c1 100644 +index 1a50b1c72..45e88edf5 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h -@@ -42,11 +42,11 @@ - #ifdef CORRADE_TARGET_WINDOWS /* Windows version of SDL2 redefines main(), we don't want that */ +@@ -46,13 +46,13 @@ #define SDL_MAIN_HANDLED #endif --#include + /* SDL.h includes the world, adding 50k LOC. We don't want that either. */ +-#include +-#include +-#include -#include -+#include ++#include ++#include ++#include +#include #ifdef CORRADE_TARGET_WINDOWS_RT @@ -17,4 +34,3 @@ index 99c3174..311b2c1 100644 #include /* For the WinMain entrypoint */ #endif - diff --git a/ports/magnum/003-glfw-find-module.patch b/ports/magnum/003-glfw-find-module.patch index 0517559e3b..8dd37d0105 100644 --- a/ports/magnum/003-glfw-find-module.patch +++ b/ports/magnum/003-glfw-find-module.patch @@ -1,11 +1,11 @@ diff --git a/modules/FindGLFW.cmake b/modules/FindGLFW.cmake -index e831fdb2..b2dba97f 100644 +index 5e13798f7..d7cb12b03 100644 --- a/modules/FindGLFW.cmake +++ b/modules/FindGLFW.cmake -@@ -39,7 +39,7 @@ - # DEALINGS IN THE SOFTWARE. - # +@@ -64,7 +64,7 @@ if(TARGET glfw) + endif() + # In case no config file was found, try manually finding the library. -find_library(GLFW_LIBRARY NAMES glfw glfw3) +find_library(GLFW_LIBRARY NAMES glfw glfw3 glfw3dll) From 892284cec8a763350159cf7f476a0306d9b318b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Schau?= Date: Tue, 19 Mar 2019 21:19:00 +0100 Subject: [PATCH 16/23] [gsoap] Include dom.* files and plugin directory (#5735) --- ports/gsoap/CONTROL | 2 +- ports/gsoap/portfile.cmake | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/gsoap/CONTROL b/ports/gsoap/CONTROL index 5523a09293..ae1d1625bc 100644 --- a/ports/gsoap/CONTROL +++ b/ports/gsoap/CONTROL @@ -1,4 +1,4 @@ Source: gsoap -Version: 2.8.82-1 +Version: 2.8.82-2 Build-Depends: curl Description: The gSOAP toolkit is a C and C++ software development toolkit for SOAP and REST XML Web services and generic C/C++ XML data bindings. \ No newline at end of file diff --git a/ports/gsoap/portfile.cmake b/ports/gsoap/portfile.cmake index 224b548202..dc7547eb28 100644 --- a/ports/gsoap/portfile.cmake +++ b/ports/gsoap/portfile.cmake @@ -50,11 +50,14 @@ endif() file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) -file(COPY ${SOURCE_PATH}/gsoap/stdsoap2.h ${SOURCE_PATH}/gsoap/stdsoap2.c ${SOURCE_PATH}/gsoap/stdsoap2.cpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/gsoap/stdsoap2.h ${SOURCE_PATH}/gsoap/stdsoap2.c ${SOURCE_PATH}/gsoap/stdsoap2.cpp ${SOURCE_PATH}/gsoap/dom.c ${SOURCE_PATH}/gsoap/dom.cpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) # Handle import files file(COPY ${SOURCE_PATH}/gsoap/import DESTINATION ${CURRENT_PACKAGES_DIR}/share/gsoap) +# Handle plugin files +file(COPY ${SOURCE_PATH}/gsoap/plugin DESTINATION ${CURRENT_PACKAGES_DIR}/share/gsoap) + # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE.txt ${SOURCE_PATH}/INSTALL.txt ${SOURCE_PATH}/README.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gsoap) file(RENAME ${CURRENT_PACKAGES_DIR}/share/gsoap/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/gsoap/copyright) From 563ab882e1fdb45a851b03d56f4c8d18cf00d7ec Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Tue, 19 Mar 2019 13:30:02 -0700 Subject: [PATCH 17/23] [qpid-proton] add libuv on osx use lubuv on osx as the proactor. --- ports/qpid-proton/CONTROL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/qpid-proton/CONTROL b/ports/qpid-proton/CONTROL index 34309a9595..2c2a1f3e9f 100644 --- a/ports/qpid-proton/CONTROL +++ b/ports/qpid-proton/CONTROL @@ -1,4 +1,4 @@ Source: qpid-proton -Version: 0.24.0 -Build-Depends: openssl +Version: 0.24.0-1 +Build-Depends: openssl, libuv (osx) Description: Qpid Proton is a high-performance, lightweight messaging library. \ No newline at end of file From fd0346372fab12a6925a4c243f2b19b713699d12 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Tue, 19 Mar 2019 13:49:03 -0700 Subject: [PATCH 18/23] [collada-dom] use vcpkg minizip/zip.h it is possible to find the wrong zip.h when doing a full CI test. Force it to find the right one. --- ports/collada-dom/portfile.cmake | 5 +++-- ports/collada-dom/use-vcpkg-minizip.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 ports/collada-dom/use-vcpkg-minizip.patch diff --git a/ports/collada-dom/portfile.cmake b/ports/collada-dom/portfile.cmake index 2612eca68c..eda714af1c 100644 --- a/ports/collada-dom/portfile.cmake +++ b/ports/collada-dom/portfile.cmake @@ -7,8 +7,9 @@ vcpkg_from_github( SHA512 cb923d296219765096f5246cc7a2b69712931f58171ae885dbdbd215fca86d911c34d12748d3304d6a5a350dc737ff0caead2495acac488af5431b437cbacc7d HEAD_REF v2.5.0 PATCHES - "${CMAKE_CURRENT_LIST_DIR}/vs-version-detection.patch" - "${CMAKE_CURRENT_LIST_DIR}/use-uriparser.patch" + vs-version-detection.patch + use-uriparser.patch + use-vcpkg-minizip.patch ) vcpkg_configure_cmake( diff --git a/ports/collada-dom/use-vcpkg-minizip.patch b/ports/collada-dom/use-vcpkg-minizip.patch new file mode 100644 index 0000000000..daaaf0f487 --- /dev/null +++ b/ports/collada-dom/use-vcpkg-minizip.patch @@ -0,0 +1,13 @@ +diff --git a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp +index 4536275..77651f9 100644 +--- a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp ++++ b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp +@@ -32,7 +32,7 @@ + #include + using namespace std; + +-#include // for saving compressed files ++#include // for saving compressed files + #ifdef _WIN32 + #include + #else From db72758b1cc200798a03b6ab162682486bdfe175 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Tue, 19 Mar 2019 14:35:16 -0700 Subject: [PATCH 19/23] [rxqt] use fixed release for rxqt --- ports/rxqt/CONTROL | 2 +- ports/rxqt/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/rxqt/CONTROL b/ports/rxqt/CONTROL index a99d58aa55..dc87425aa4 100644 --- a/ports/rxqt/CONTROL +++ b/ports/rxqt/CONTROL @@ -1,4 +1,4 @@ Source: rxqt -Version: +Version: bb2138c Description: The Reactive Extensions for Qt. Build-Depends: rxcpp \ No newline at end of file diff --git a/ports/rxqt/portfile.cmake b/ports/rxqt/portfile.cmake index 8531af15bb..f84bf7c7ce 100644 --- a/ports/rxqt/portfile.cmake +++ b/ports/rxqt/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tetsurom/rxqt - REF master - SHA512 3f25570ab98c8d3959c35b0d99d5c35486339aa8cd752d8140bb064239265ecb8c5002e3a5e2b46324bb79b558cfe0f17e23a59ad51e6d3a0764acdce493b12c + REF bb2138c835ef96a53bb79c47fb318237564f9a0c + SHA512 df39f05b0b4fcd950dd39f40b32e20097352a935778af1be077a08644b3562d07dcc77ab658bc45437454372be955a40013570124e86943bb32493c66cdce439 HEAD_REF master ) From bcf7db4d460e8c803a420ed81e7a968807b40e7f Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 19 Mar 2019 16:12:19 -0700 Subject: [PATCH 20/23] [rapidjson] Fix --head support (#3693) --- ports/rapidjson/portfile.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/rapidjson/portfile.cmake b/ports/rapidjson/portfile.cmake index 8c1c0b9380..2e3787857a 100644 --- a/ports/rapidjson/portfile.cmake +++ b/ports/rapidjson/portfile.cmake @@ -26,8 +26,15 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) # Delete redundant directories -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/share/doc) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/share/doc) # Put the licence file where vcpkg expects it file(COPY ${SOURCE_PATH}/license.txt ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/rapidjson) file(RENAME ${CURRENT_PACKAGES_DIR}/share/rapidjson/license.txt ${CURRENT_PACKAGES_DIR}/share/rapidjson/copyright) + +if(VCPKG_USE_HEAD_VERSION) + file(READ "${CURRENT_PACKAGES_DIR}/share/rapidjson/RapidJSONConfig.cmake" _contents) + string(REPLACE "\${RapidJSON_SOURCE_DIR}" "\${RapidJSON_CMAKE_DIR}/../.." _contents "${_contents}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/rapidjson/RapidJSONConfig.cmake" "${_contents}\nset(RAPIDJSON_INCLUDE_DIRS \"\${RapidJSON_INCLUDE_DIRS}\")\n") + # Note: adding this extra setting for RAPIDJSON_INCLUDE_DIRS maintains compatibility with previous rapidjson versions +endif() From 03558e75079187eb090349a99c11572905933c02 Mon Sep 17 00:00:00 2001 From: LarryIII <33021067+LarryIII@users.noreply.github.com> Date: Wed, 20 Mar 2019 09:51:08 -0700 Subject: [PATCH 21/23] [fribidi] Update Version to support static build (#5745) --- ports/fribidi/CONTROL | 2 +- ports/fribidi/portfile.cmake | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/fribidi/CONTROL b/ports/fribidi/CONTROL index 65e9a2248d..098748ee80 100644 --- a/ports/fribidi/CONTROL +++ b/ports/fribidi/CONTROL @@ -1,3 +1,3 @@ Source: fribidi -Version: 1.0.5 +Version: 58c6cb3 Description: GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi) diff --git a/ports/fribidi/portfile.cmake b/ports/fribidi/portfile.cmake index d366b89ef4..ec5dc15538 100644 --- a/ports/fribidi/portfile.cmake +++ b/ports/fribidi/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fribidi/fribidi - REF v1.0.5 - SHA512 c51b67cc3e7610bef9a66f2456f7602fe010164c2c01e7d91026cefa4a08fdce5165b6eb3814e76cd89e766356fb71adc08bf75d9b2f5802f71c18b5d0476887 + REF 58c6cb390a9a18c98b2cbaac555d8ea9352a9e4f + SHA512 1ec9c19faa87886786ce1589e2c66cab173b48e34d0e43487becc8606001f21f6ed17d0abd1c322fbbcaeb96a47ed882cad228be2e9beb019020ca2a475fc298 HEAD_REF master) vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH} @@ -23,5 +23,9 @@ if (EXE_FILES) file(REMOVE ${EXE_FILES}) endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fribidi RENAME copyright) \ No newline at end of file From 6f0594756e2dcd8a66422073d9b0e2e4bbc1ed03 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 20 Mar 2019 10:55:42 -0700 Subject: [PATCH 22/23] Update cpprestsdk to v2.10.11. (#5748) --- ports/cpprestsdk/CONTROL | 2 +- ports/cpprestsdk/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL index aaa41316e6..20a44a2bad 100644 --- a/ports/cpprestsdk/CONTROL +++ b/ports/cpprestsdk/CONTROL @@ -1,5 +1,5 @@ Source: cpprestsdk -Version: 2.10.10 +Version: 2.10.11 Build-Depends: zlib, openssl (!uwp&!windows), boost-system (!uwp&!windows), boost-date-time (!uwp&!windows), boost-regex (!uwp&!windows), boost-thread (!uwp&!windows), boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows) Description: C++11 JSON, REST, and OAuth library The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services. diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake index 9f34226ef1..7f0ca2ed06 100644 --- a/ports/cpprestsdk/portfile.cmake +++ b/ports/cpprestsdk/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/cpprestsdk - REF v2.10.10 - SHA512 6169d0907aead80a4e0a3f6a25fb71ab13a46a10a9700974c629b91948a83ee3c841a4ac7dfac8155ea3731c0eedee594c07ec37050d57770faf4eee608660e5 + REF v2.10.11 + SHA512 ea2299e128f8a75e67bb29fb42ce249cf48166c60cc73ec40d3f6ec5ae7b283ac8a083d62a7221b35f1f7876d814263a96b2a376bb306b1b4605ef17de36a115 HEAD_REF master ) From 64fc3202f557cdba7befd561d8ddb1bd83609606 Mon Sep 17 00:00:00 2001 From: JackBoosY <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 21 Mar 2019 01:56:25 +0800 Subject: [PATCH 23/23] [clapack]fix missing library and tools. (#5749) --- ports/clapack/CONTROL | 2 +- ports/clapack/fix-lack-library.patch | 19 +++++++++++++++++++ ports/clapack/portfile.cmake | 4 +++- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 ports/clapack/fix-lack-library.patch diff --git a/ports/clapack/CONTROL b/ports/clapack/CONTROL index 503ddbac5c..c30f5eb95c 100644 --- a/ports/clapack/CONTROL +++ b/ports/clapack/CONTROL @@ -1,4 +1,4 @@ Source: clapack -Version: 3.2.1-1 +Version: 3.2.1-2 Description: CLAPACK (f2c'ed version of LAPACK) Build-Depends: openblas diff --git a/ports/clapack/fix-lack-library.patch b/ports/clapack/fix-lack-library.patch new file mode 100644 index 0000000000..f586c04c58 --- /dev/null +++ b/ports/clapack/fix-lack-library.patch @@ -0,0 +1,19 @@ +diff --git a/F2CLIBS/libf2c/CMakeLists.txt b/F2CLIBS/libf2c/CMakeLists.txt +index 2bdbd05..e77b3a3 100644 +--- a/F2CLIBS/libf2c/CMakeLists.txt ++++ b/F2CLIBS/libf2c/CMakeLists.txt +@@ -60,3 +60,13 @@ include_directories(${CLAPACK_SOURCE_DIR}/F2CLIBS/libf2c) + include_directories(${CLAPACK_BINARY_DIR}/F2CLIBS/libf2c) + add_library(f2c STATIC ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h) + set_property(TARGET f2c PROPERTY PREFIX lib) ++ ++install(TARGETS f2c ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++ ++install(TARGETS arithchk ++ RUNTIME DESTINATION tools ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) +\ No newline at end of file diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake index 933294419a..9e67594f91 100644 --- a/ports/clapack/portfile.cmake +++ b/ports/clapack/portfile.cmake @@ -29,7 +29,9 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/lapack.def DESTINATION ${SOURCE_PATH}/SRC) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-other-blas-and-install-include.patch" + PATCHES + use-other-blas-and-install-include.patch + fix-lack-library.patch ) vcpkg_configure_cmake(