diff --git a/ports/sais/portfile.cmake b/ports/sais/portfile.cmake index 5c0a0891a6..2a170918aa 100644 --- a/ports/sais/portfile.cmake +++ b/ports/sais/portfile.cmake @@ -5,23 +5,22 @@ vcpkg_download_distfile(ARCHIVE SHA512 6f6dd11f842f680bebc1d9b7f6b75752c9589c600fdd5e6373bb7290a686f1de35d4cc3226347e717f89a295363f7fee0ae8b1aa05ad341f4c2ea056fb5b1425 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBUILD_SAIS64=ON + -DBUILD_SAIS64=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/sais/vcpkg.json b/ports/sais/vcpkg.json index 7b0edbadd3..531a2c03b1 100644 --- a/ports/sais/vcpkg.json +++ b/ports/sais/vcpkg.json @@ -1,6 +1,12 @@ { "name": "sais", "version-string": "2.4.1", - "port-version": 3, - "description": "An implementation of the induced sorting algorithm" + "port-version": 4, + "description": "An implementation of the induced sorting algorithm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/sajson/portfile.cmake b/ports/sajson/portfile.cmake index 4fd0cac33d..6b88f5be8f 100644 --- a/ports/sajson/portfile.cmake +++ b/ports/sajson/portfile.cmake @@ -8,18 +8,17 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/unofficial-sajson TARGET_PATH share/unofficial-sajson) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-sajson CONFIG_PATH share/cmake/unofficial-sajson) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/sajson/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/sajson/copyright" COPYONLY) diff --git a/ports/sajson/vcpkg.json b/ports/sajson/vcpkg.json index 2cde87c546..8c4fe87358 100644 --- a/ports/sajson/vcpkg.json +++ b/ports/sajson/vcpkg.json @@ -1,6 +1,16 @@ { "name": "sajson", "version-string": "2018-09-21", - "port-version": 1, - "description": "Lightweight, extremely high-performance JSON parser for C++11" + "port-version": 2, + "description": "Lightweight, extremely high-performance JSON parser for C++11", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/scnlib/portfile.cmake b/ports/scnlib/portfile.cmake index 0595fa4877..6011204226 100644 --- a/ports/scnlib/portfile.cmake +++ b/ports/scnlib/portfile.cmake @@ -8,9 +8,8 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSCN_TESTS=OFF -DSCN_EXAMPLES=OFF @@ -19,14 +18,15 @@ vcpkg_configure_cmake( -DSCN_RANGES=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/scn) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/scn) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/share/scn) + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/scn" +) -file(INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/scnlib/vcpkg.json b/ports/scnlib/vcpkg.json index 7554420878..a4b786a9c7 100644 --- a/ports/scnlib/vcpkg.json +++ b/ports/scnlib/vcpkg.json @@ -1,6 +1,17 @@ { "name": "scnlib", "version": "1.0", + "port-version": 1, "description": "scnlib is a modern C++ library for replacing scanf and std::istream", - "homepage": "https://scnlib.dev/" + "homepage": "https://scnlib.dev/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/sdl1-net/portfile.cmake b/ports/sdl1-net/portfile.cmake index e88d99d359..2f21e84157 100644 --- a/ports/sdl1-net/portfile.cmake +++ b/ports/sdl1-net/portfile.cmake @@ -4,21 +4,19 @@ vcpkg_download_distfile(ARCHIVE SHA512 2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DSDL_NET_SKIP_HEADERS=ON) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl1-net) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/sdl1-net/COPYING ${CURRENT_PACKAGES_DIR}/share/sdl1-net/copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/sdl1-net/vcpkg.json b/ports/sdl1-net/vcpkg.json index cd4e84a030..d76a7ba213 100644 --- a/ports/sdl1-net/vcpkg.json +++ b/ports/sdl1-net/vcpkg.json @@ -1,9 +1,13 @@ { "name": "sdl1-net", "version-string": "1.2.8", - "port-version": 4, + "port-version": 5, "description": "Networking library for SDL", "dependencies": [ - "sdl1" + "sdl1", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/sdl2-gfx/portfile.cmake b/ports/sdl2-gfx/portfile.cmake index 16616c23b0..5c6dfcd314 100644 --- a/ports/sdl2-gfx/portfile.cmake +++ b/ports/sdl2-gfx/portfile.cmake @@ -6,27 +6,26 @@ vcpkg_download_distfile(ARCHIVE SHA512 213b481469ba2161bd8558a7a5427b129420193b1c3895923d515f69f87991ed2c99bbc44349c60b4bcbb7d7d2255c1f15ee8a3523c26502070cfaacccaa5242 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} - REF ${VERSION} + SOURCE_BASE "${VERSION}" PATCHES 001-lrint-arm64.patch 002-use-the-lrintf-intrinsic.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DSDL_GFX_SKIP_HEADERS=1 ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() \ No newline at end of file diff --git a/ports/sdl2-gfx/vcpkg.json b/ports/sdl2-gfx/vcpkg.json index 8818ca6a36..b5ba5206ab 100644 --- a/ports/sdl2-gfx/vcpkg.json +++ b/ports/sdl2-gfx/vcpkg.json @@ -1,9 +1,17 @@ { "name": "sdl2-gfx", "version-string": "1.0.4", - "port-version": 8, + "port-version": 9, "description": "Graphics primitives (line, circle, rectangle etc.) with AA support, rotozoomer and other drawing related support functions wrapped up in a C based add-on library for the Simple Direct Media (SDL) cross-platform API layer.", "dependencies": [ - "sdl2" + "sdl2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/septag-sx/portfile.cmake b/ports/septag-sx/portfile.cmake index 0d7686bcf2..9eba794a0b 100644 --- a/ports/septag-sx/portfile.cmake +++ b/ports/septag-sx/portfile.cmake @@ -12,28 +12,27 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SX_SHARED_LIB) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSX_BUILD_TESTS=OFF -DSX_SHARED_LIB=${SX_SHARED_LIB} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sx TARGET_PATH share/sx) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sx PACKAGE_NAME sx) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/sx/config.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sx/config.h" "define SX_CONFIG_SHARED_LIB 0" "define SX_CONFIG_SHARED_LIB 1" ) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/septag-sx/vcpkg.json b/ports/septag-sx/vcpkg.json index 7348da8272..016f5fea6d 100644 --- a/ports/septag-sx/vcpkg.json +++ b/ports/septag-sx/vcpkg.json @@ -1,7 +1,17 @@ { "name": "septag-sx", "version-string": "2019-05-07", - "port-version": 3, + "port-version": 4, "description": "Portable base library for C programmers, designed for performance and simplicity.", - "supports": "!(uwp | arm)" + "supports": "!(uwp | arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/serd/portfile.cmake b/ports/serd/portfile.cmake index 6e6173cc0b..46a98e9b44 100644 --- a/ports/serd/portfile.cmake +++ b/ports/serd/portfile.cmake @@ -9,16 +9,15 @@ vcpkg_from_gitlab( file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1 ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() file( INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" diff --git a/ports/serd/vcpkg.json b/ports/serd/vcpkg.json index db40b57c24..ae85876fdd 100644 --- a/ports/serd/vcpkg.json +++ b/ports/serd/vcpkg.json @@ -1,7 +1,18 @@ { "name": "serd", "version-string": "0.30.4", + "port-version": 1, "description": "Serd is a lightweight C library for RDF syntax which supports reading and writing Turtle, TRiG, NTriples, and NQuads.", "homepage": "https://drobilla.net/software/serd", - "license": "ISC" + "license": "ISC", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/sf2cute/portfile.cmake b/ports/sf2cute/portfile.cmake index d82c0f94f9..acd92aed36 100644 --- a/ports/sf2cute/portfile.cmake +++ b/ports/sf2cute/portfile.cmake @@ -12,25 +12,24 @@ if("example" IN_LIST FEATURES) set(BUILD_EXAMPLE ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DSF2CUTE_EXAMPLES_INSTALL_DIR=tools/sf2cute OPTIONS_RELEASE -DSF2CUTE_INSTALL_EXAMPLES=${BUILD_EXAMPLE} - -DSF2CUTE_EXAMPLES_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/tools/sf2cute + "-DSF2CUTE_EXAMPLES_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/tools/sf2cute" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sf2cute RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/sf2cute" RENAME copyright) if(BUILD_EXAMPLE) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/sf2cute) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/sf2cute") endif() diff --git a/ports/sf2cute/vcpkg.json b/ports/sf2cute/vcpkg.json index 9db53abbc6..66679aef8b 100644 --- a/ports/sf2cute/vcpkg.json +++ b/ports/sf2cute/vcpkg.json @@ -1,8 +1,18 @@ { "name": "sf2cute", "version-string": "0.2.0", - "port-version": 2, + "port-version": 3, "description": "C++14 Library for SoundFont 2", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "example": { "description": "Installs an example application" diff --git a/ports/sfgui/portfile.cmake b/ports/sfgui/portfile.cmake index ee3974c10a..09a50c1f84 100644 --- a/ports/sfgui/portfile.cmake +++ b/ports/sfgui/portfile.cmake @@ -9,31 +9,30 @@ vcpkg_from_github( "002-add-limits-header.patch" ) -file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindSFML.cmake) +file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindSFML.cmake") string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SFGUI_BUILD_SHARED_LIBS) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSFGUI_BUILD_DOC=OFF -DSFGUI_BUILD_EXAMPLES=OFF -DSFGUI_BUILD_SHARED_LIBS=${SFGUI_BUILD_SHARED_LIBS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) - file(GLOB_RECURSE SFGUI_DOC_RELEASE ${CURRENT_PACKAGES_DIR}/*.md) - file(GLOB_RECURSE SFGUI_DOC_DEBUG ${CURRENT_PACKAGES_DIR}/debug/*.md) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) + file(GLOB_RECURSE SFGUI_DOC_RELEASE "${CURRENT_PACKAGES_DIR}/*.md") + file(GLOB_RECURSE SFGUI_DOC_DEBUG "${CURRENT_PACKAGES_DIR}/debug/*.md") file(REMOVE ${SFGUI_DOC_RELEASE} ${SFGUI_DOC_DEBUG}) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH share/SFGUI/cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH share/SFGUI/cmake) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/sfgui RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/sfgui/vcpkg.json b/ports/sfgui/vcpkg.json index e0cbe393a5..47a1f75548 100644 --- a/ports/sfgui/vcpkg.json +++ b/ports/sfgui/vcpkg.json @@ -1,10 +1,18 @@ { "name": "sfgui", "version": "0.4.0", - "port-version": 5, + "port-version": 6, "description": "simple and fast graphical user interface library", "homepage": "https://github.com/TankOs/SFGUI", "dependencies": [ - "sfml" + "sfml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/sfsexp/portfile.cmake b/ports/sfsexp/portfile.cmake index 7b266ce08a..9619c909bb 100644 --- a/ports/sfsexp/portfile.cmake +++ b/ports/sfsexp/portfile.cmake @@ -12,12 +12,11 @@ vcpkg_from_github( file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/sfsexp/vcpkg.json b/ports/sfsexp/vcpkg.json index cb2134fff6..0e9fb0c0e5 100644 --- a/ports/sfsexp/vcpkg.json +++ b/ports/sfsexp/vcpkg.json @@ -1,6 +1,13 @@ { "name": "sfsexp", "version": "1.3.1", + "port-version": 1, "description": "Small Fast S-Expression Library", - "homepage": "https://github.com/mjsottile/sfsexp" + "homepage": "https://github.com/mjsottile/sfsexp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/shiva-sfml/portfile.cmake b/ports/shiva-sfml/portfile.cmake index 0e603e8de4..efc79a8113 100644 --- a/ports/shiva-sfml/portfile.cmake +++ b/ports/shiva-sfml/portfile.cmake @@ -6,27 +6,29 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DSHIVA_BUILD_TESTS=OFF -DSHIVA_USE_SFML_AS_RENDERER=ON -DSHIVA_INSTALL_PLUGINS=ON -DSHIVA_BUILD_EXAMPLES=OFF + -DSHIVA_BUILD_TESTS=OFF + -DSHIVA_USE_SFML_AS_RENDERER=ON + -DSHIVA_INSTALL_PLUGINS=ON + -DSHIVA_BUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() if (VCPKG_CMAKE_SYSTEM_NAME) - file(GLOB PLUGINS_RELEASE ${SOURCE_PATH}/bin/Release/systems/*) - file(GLOB PLUGINS_DEBUG ${SOURCE_PATH}/bin/Debug/systems/*) + file(GLOB PLUGINS_RELEASE "${SOURCE_PATH}/bin/Release/systems/*") + file(GLOB PLUGINS_DEBUG "${SOURCE_PATH}/bin/Debug/systems/*") else() - file(GLOB PLUGINS_RELEASE ${SOURCE_PATH}/bin/Release/systems/*.dll) - file(GLOB PLUGINS_DEBUG ${SOURCE_PATH}/bin/Debug/systems/*.dll) + file(GLOB PLUGINS_RELEASE "${SOURCE_PATH}/bin/Release/systems/*.dll") + file(GLOB PLUGINS_DEBUG "${SOURCE_PATH}/bin/Debug/systems/*.dll") endif() message(STATUS "PLUGINS_RELEASE -> ${PLUGINS_RELEASE}") message(STATUS "PLUGINS_DEBUG -> ${PLUGINS_DEBUG}") -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/shiva-sfml) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/shiva-sfml) if (VCPKG_CMAKE_SYSTEM_NAME) @@ -38,49 +40,49 @@ endif() ##! Pre removing if (VCPKG_CMAKE_SYSTEM_NAME) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") endif() ##! Include -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include/shiva-sfml) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include/shiva-sfml") ##! Release -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Release) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Release") ##! Debug -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Debug) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Debug") ##! Copy Plugins -file(COPY ${PLUGINS_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Release) -file(COPY ${PLUGINS_DEBUG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Debug) +file(COPY ${PLUGINS_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Release") +file(COPY ${PLUGINS_DEBUG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Debug") if (NOT VCPKG_CMAKE_SYSTEM_NAME) - find_file(LUADLL lua.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) - find_file(FMTDLL fmt.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) - find_file(FLACDLL FLAC.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) - find_file(FREETYPEDLL freetype.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) - find_file(LIBBZ2DLL libbz2.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) - find_file(LIBPNG16DLL libpng16.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) - find_file(OGGDLL ogg.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) - find_file(OPENAL32DLL OpenAL32.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) - find_file(SFMLAUDIO2DLL sfml-audio-2.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) - find_file(SFMLGRAPHICS2DLL sfml-graphics-2.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) - find_file(SFMLSYSTEM2DLL sfml-system-2.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) - find_file(SFMLWINDOW2DLL sfml-window-2.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) - find_file(VORBISDLL vorbis.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) - find_file(VORBISENCDLL vorbisenc.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) - find_file(VORBISFILEDLL vorbisfile.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) - find_file(ZLIB1DLL zlib1.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) + find_file(LUADLL lua.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") + find_file(FMTDLL fmt.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") + find_file(FLACDLL FLAC.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") + find_file(FREETYPEDLL freetype.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") + find_file(LIBBZ2DLL libbz2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") + find_file(LIBPNG16DLL libpng16.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") + find_file(OGGDLL ogg.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") + find_file(OPENAL32DLL OpenAL32.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") + find_file(SFMLAUDIO2DLL sfml-audio-2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") + find_file(SFMLGRAPHICS2DLL sfml-graphics-2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") + find_file(SFMLSYSTEM2DLL sfml-system-2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") + find_file(SFMLWINDOW2DLL sfml-window-2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") + find_file(VORBISDLL vorbis.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") + find_file(VORBISENCDLL vorbisenc.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") + find_file(VORBISFILEDLL vorbisfile.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") + find_file(ZLIB1DLL zlib1.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") set(DEPENDANCIES_RELEASE_DLL ${LUADLL} ${FMTDLL} @@ -99,22 +101,22 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME) ${VORBISFILEDLL} ${ZLIB1DLL}) - find_file(LUADLL_D lua.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) - find_file(FMTDLL_D fmtd.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) - find_file(FLACDLL_D FLAC.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) - find_file(FREETYPEDLL_D freetyped.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) - find_file(LIBBZ2DLL_D libbz2d.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) - find_file(LIBPNG16DLL_D libpng16d.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) - find_file(OGGDLL_D ogg.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) - find_file(OPENAL32DLL_D OpenAL32.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) - find_file(SFMLAUDIO2DLL_D sfml-audio-d-2.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) - find_file(SFMLGRAPHICS2DLL_D sfml-graphics-d-2.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) - find_file(SFMLSYSTEM2DLL_D sfml-system-d-2.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) - find_file(SFMLWINDOW2DLL_D sfml-window-d-2.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) - find_file(VORBISDLL_D vorbis.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) - find_file(VORBISENCDLL_D vorbisenc.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) - find_file(VORBISFILEDLL_D vorbisfile.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) - find_file(ZLIB1DLL_D zlibd1.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) + find_file(LUADLL_D lua.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") + find_file(FMTDLL_D fmtd.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") + find_file(FLACDLL_D FLAC.dll PATHS $"{CURRENT_INSTALLED_DIR}/debug/bin") + find_file(FREETYPEDLL_D freetyped.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") + find_file(LIBBZ2DLL_D libbz2d.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") + find_file(LIBPNG16DLL_D libpng16d.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") + find_file(OGGDLL_D ogg.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") + find_file(OPENAL32DLL_D OpenAL32.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") + find_file(SFMLAUDIO2DLL_D sfml-audio-d-2.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") + find_file(SFMLGRAPHICS2DLL_D sfml-graphics-d-2.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") + find_file(SFMLSYSTEM2DLL_D sfml-system-d-2.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") + find_file(SFMLWINDOW2DLL_D sfml-window-d-2.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") + find_file(VORBISDLL_D vorbis.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") + find_file(VORBISENCDLL_D vorbisenc.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") + find_file(VORBISFILEDLL_D vorbisfile.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") + find_file(ZLIB1DLL_D zlibd1.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") set(DEPENDANCIES_DEBUG_DLL ${LUADLL_D} ${FMTDLL_D} @@ -134,9 +136,9 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME) ${ZLIB1DLL_D} ) - file(COPY ${DEPENDANCIES_RELEASE_DLL} DESTINATION ${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Release) - file(COPY ${DEPENDANCIES_DEBUG_DLL} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Debug) + file(COPY ${DEPENDANCIES_RELEASE_DLL} DESTINATION "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Release") + file(COPY ${DEPENDANCIES_DEBUG_DLL} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Debug") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/shiva-sfml/empty.h "") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/shiva-sfml/copyright "") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/shiva-sfml/empty.h" "") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/shiva-sfml/copyright" "") diff --git a/ports/shiva-sfml/vcpkg.json b/ports/shiva-sfml/vcpkg.json index 7fce5e8090..f47e49ee76 100644 --- a/ports/shiva-sfml/vcpkg.json +++ b/ports/shiva-sfml/vcpkg.json @@ -1,13 +1,21 @@ { "name": "shiva-sfml", "version-string": "1.0", - "port-version": 2, + "port-version": 3, "description": "shiva-sfml plugins of shiva C++ engine", "dependencies": [ { "name": "sfml", "platform": "windows" }, - "shiva" + "shiva", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/shogun/portfile.cmake b/ports/shogun/portfile.cmake index 59ca49306c..9b04a2ce64 100644 --- a/ports/shogun/portfile.cmake +++ b/ports/shogun/portfile.cmake @@ -17,11 +17,10 @@ vcpkg_from_github( vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) -vcpkg_add_to_path(${PYTHON3_DIR}) +vcpkg_add_to_path("${PYTHON3_DIR}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_META_EXAMPLES=OFF -DBUILD_EXAMPLES=OFF @@ -47,15 +46,15 @@ vcpkg_configure_cmake( -DINSTALL_TARGETS=shogun-static ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/shogun) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/shogun) file(REMOVE_RECURSE # This directory is empty given the settings above - ${CURRENT_PACKAGES_DIR}/include/shogun/mathematics/linalg/backend - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/include/shogun/mathematics/linalg/backend" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/shogun/vcpkg.json b/ports/shogun/vcpkg.json index d3c78c1b27..8ae367b8f2 100644 --- a/ports/shogun/vcpkg.json +++ b/ports/shogun/vcpkg.json @@ -1,7 +1,7 @@ { "name": "shogun", "version-string": "6.1.4", - "port-version": 7, + "port-version": 8, "description": "Unified and efficient Machine Learning", "homepage": "https://github.com/shogun-toolbox/shogun", "dependencies": [ @@ -17,6 +17,14 @@ "protobuf", "rxcpp", "snappy", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/signalrclient/portfile.cmake b/ports/signalrclient/portfile.cmake index f66b3a2fca..d7b4c52eba 100644 --- a/ports/signalrclient/portfile.cmake +++ b/ports/signalrclient/portfile.cmake @@ -9,22 +9,20 @@ vcpkg_from_github( 0002_fix-compile-error.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG - -DCPPREST_SO=${CURRENT_INSTALLED_DIR}/debug/lib/cpprest_2_10d.lib + "-DCPPREST_SO=${CURRENT_INSTALLED_DIR}/debug/lib/cpprest_2_10d.lib" OPTIONS_RELEASE - -DCPPREST_SO=${CURRENT_INSTALLED_DIR}/lib/cpprest_2_10.lib + "-DCPPREST_SO=${CURRENT_INSTALLED_DIR}/lib/cpprest_2_10.lib" OPTIONS - -DCPPREST_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + "-DCPPREST_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include" -DDISABLE_TESTS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # copy license -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/signalrclient) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/signalrclient/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/signalrclient/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/signalrclient/vcpkg.json b/ports/signalrclient/vcpkg.json index e2faf07bc3..5df043d311 100644 --- a/ports/signalrclient/vcpkg.json +++ b/ports/signalrclient/vcpkg.json @@ -1,7 +1,7 @@ { "name": "signalrclient", "version-string": "1.0.0-beta1-9", - "port-version": 2, + "port-version": 3, "description": "C++ client for SignalR.", "homepage": "https://github.com/SignalR/SignalR-Client-Cpp", "dependencies": [ @@ -12,6 +12,10 @@ "websockets" ] }, - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/slikenet/portfile.cmake b/ports/slikenet/portfile.cmake index 74572911d4..20418b47af 100644 --- a/ports/slikenet/portfile.cmake +++ b/ports/slikenet/portfile.cmake @@ -13,24 +13,23 @@ file(REMOVE_RECURSE "${SOURCE_PATH}/Source/src/crypto" "${SOURCE_PATH}/Source/in string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SLIKENET_ENABLE_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SLIKENET_ENABLE_DLL) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSLIKENET_ENABLE_DLL=${SLIKENET_ENABLE_DLL} -DSLIKENET_ENABLE_STATIC=${SLIKENET_ENABLE_STATIC} -DSLIKENET_ENABLE_SAMPLES=FALSE ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/slikenet) +vcpkg_cmake_config_fixup(CONFIG_PATH share/slikenet) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) configure_file("${CMAKE_CURRENT_LIST_DIR}/slikenet-config.cmake" "${CURRENT_PACKAGES_DIR}/share/slikenet/slikenet-config.cmake" COPYONLY) configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/slikenet/vcpkg-cmake-wrapper.cmake" COPYONLY) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/slikenet/vcpkg.json b/ports/slikenet/vcpkg.json index fa74ed5946..1339756984 100644 --- a/ports/slikenet/vcpkg.json +++ b/ports/slikenet/vcpkg.json @@ -1,11 +1,19 @@ { "name": "slikenet", "version-date": "2021-06-07", - "port-version": 1, + "port-version": 2, "description": "SLikeNetT is an Open Source/Free Software cross-platform network engine written in C++ and specifially designed for games (and applications which have comparable requirements on a network engine like games) building upon the discontinued RakNet network engine which had more than 13 years of active development.", "homepage": "https://github.com/SLikeSoft/SLikeNet", "supports": "!uwp", "dependencies": [ - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/sltbench/portfile.cmake b/ports/sltbench/portfile.cmake index 2111c896bf..e5923846e5 100644 --- a/ports/sltbench/portfile.cmake +++ b/ports/sltbench/portfile.cmake @@ -7,13 +7,13 @@ vcpkg_from_github( SHA512 0c66b51f5a950a09df47019775941554538bc3642788f61aaf8c5ec3644d5fef721391f73c3fddfd9529159f9b81c7d7ed76c7995a79f37adaf8d0ff55a99d4b HEAD_REF master) -vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH}) -vcpkg_install_cmake() +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}" WINDOWS_USE_MSBUILD) +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake/ TARGET_PATH share/sltbench) +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file( - INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/sltbench/vcpkg.json b/ports/sltbench/vcpkg.json index efa7c527f2..20c287a835 100644 --- a/ports/sltbench/vcpkg.json +++ b/ports/sltbench/vcpkg.json @@ -1,6 +1,17 @@ { "name": "sltbench", "version-string": "2.4.0", + "port-version": 1, "description": "C++ benchmark tool. Practical, stable and fast performance testing framework.", - "homepage": "https://github.com/ivafanas/sltbench" + "homepage": "https://github.com/ivafanas/sltbench", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/smpeg2/portfile.cmake b/ports/smpeg2/portfile.cmake index acba222377..b1f31968c4 100644 --- a/ports/smpeg2/portfile.cmake +++ b/ports/smpeg2/portfile.cmake @@ -6,26 +6,24 @@ vcpkg_download_distfile(ARCHIVE SHA512 80a779d01e7aa76778ef6ceea8041537db9e4b354df413214c4413c875cb98551891cef98fa0f057cc6a3222e4983da9ae65b86bdad2f87f9e2a6751837e2baf ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${VERSION} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + SOURCE_BASE "${VERSION}" PATCHES "001-correct-sdl-headers-dir.patch" "002-use-SDL2-headers.patch" "003-fix-double-ptr-to-int-comparison.patch" ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DSMPEG_SKIP_HEADERS=ON) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/smpeg2) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/smpeg2/COPYING ${CURRENT_PACKAGES_DIR}/share/smpeg2/copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/smpeg2/vcpkg.json b/ports/smpeg2/vcpkg.json index 24eb88e52e..4520ec7aa2 100644 --- a/ports/smpeg2/vcpkg.json +++ b/ports/smpeg2/vcpkg.json @@ -1,10 +1,14 @@ { "name": "smpeg2", "version-string": "2.0.0", - "port-version": 7, + "port-version": 8, "description": "SDL MPEG Player Library", "homepage": "https://www.libsdl.org/projects/smpeg/", "dependencies": [ - "sdl2" + "sdl2", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/soem/portfile.cmake b/ports/soem/portfile.cmake index 069e405628..338222a55d 100644 --- a/ports/soem/portfile.cmake +++ b/ports/soem/portfile.cmake @@ -11,18 +11,18 @@ vcpkg_from_github( disable-werror.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/bin - ${CURRENT_PACKAGES_DIR}/debug/bin - ${CURRENT_PACKAGES_DIR}/debug/include) + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + "${CURRENT_PACKAGES_DIR}/debug/include" +) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/soem/vcpkg.json b/ports/soem/vcpkg.json index 8b4dcaab7e..eb303eb66d 100644 --- a/ports/soem/vcpkg.json +++ b/ports/soem/vcpkg.json @@ -1,11 +1,15 @@ { "name": "soem", "version": "1.4.0", - "port-version": 3, + "port-version": 4, "description": "Simple Open Source EtherCAT Master", "homepage": "https://github.com/OpenEtherCATsociety/SOEM", "supports": "!uwp", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, { "name": "winpcap", "platform": "windows" diff --git a/ports/soil/portfile.cmake b/ports/soil/portfile.cmake index 4d591dbe19..2e413b12b3 100644 --- a/ports/soil/portfile.cmake +++ b/ports/soil/portfile.cmake @@ -8,19 +8,18 @@ vcpkg_from_github( ) file(COPY - ${CMAKE_CURRENT_LIST_DIR}/soilConfig.cmake.in - ${CMAKE_CURRENT_LIST_DIR}/soilConfigVersion.cmake.in + "${CMAKE_CURRENT_LIST_DIR}/soilConfig.cmake.in" + "${CMAKE_CURRENT_LIST_DIR}/soilConfigVersion.cmake.in" DESTINATION ${SOURCE_PATH} ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/soil/vcpkg.json b/ports/soil/vcpkg.json index 11ef3473b0..ba5648b8c4 100644 --- a/ports/soil/vcpkg.json +++ b/ports/soil/vcpkg.json @@ -1,8 +1,14 @@ { "name": "soil", "version-date": "2021-04-22", - "port-version": 1, + "port-version": 2, "description": "SOIL is a tiny C library used primarily for uploading textures into OpenGL.", "homepage": "https://github.com/paralin/soil", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/sord/portfile.cmake b/ports/sord/portfile.cmake index 6725863d56..b3fcca46d4 100644 --- a/ports/sord/portfile.cmake +++ b/ports/sord/portfile.cmake @@ -9,16 +9,15 @@ vcpkg_from_gitlab( file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1 ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() file( INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" diff --git a/ports/sord/vcpkg.json b/ports/sord/vcpkg.json index 51dacf7938..4db1a0c112 100644 --- a/ports/sord/vcpkg.json +++ b/ports/sord/vcpkg.json @@ -1,10 +1,19 @@ { "name": "sord", "version-string": "0.16.4", + "port-version": 1, "description": "Sord is a lightweight C library for storing RDF statements in memory.", "homepage": "https://drobilla.net/software/sord", "license": "ISC", "dependencies": [ - "serd" + "serd", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/spaceland/portfile.cmake b/ports/spaceland/portfile.cmake index 2897f73678..3f22a82358 100644 --- a/ports/spaceland/portfile.cmake +++ b/ports/spaceland/portfile.cmake @@ -6,14 +6,13 @@ vcpkg_download_distfile(ARCHIVE SHA512 1391dac1474ddb47d0cf0eb7baeb7db68d6356c2116f732dd57b8a050739523282ded0643cc466640f2b22f25dd6bfced00ede4e041b7ff83754a99ae6725d7d ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DSL_TEST=OFF @@ -23,7 +22,7 @@ vcpkg_configure_cmake( -DSL_INSTALL_SLFIND_MODULE=OFF ) -vcpkg_install_cmake() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/spaceland/vcpkg.json b/ports/spaceland/vcpkg.json index ddcdb9fde1..8a729cac27 100644 --- a/ports/spaceland/vcpkg.json +++ b/ports/spaceland/vcpkg.json @@ -1,9 +1,13 @@ { "name": "spaceland", "version-string": "7.8.2", - "port-version": 5, + "port-version": 6, "description": "Spaceland Lib (sl) is a suite for geometric computation, specifically adapted to OpenGL.", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ] } diff --git a/ports/sparsepp/portfile.cmake b/ports/sparsepp/portfile.cmake index c326c214c9..729836a08e 100644 --- a/ports/sparsepp/portfile.cmake +++ b/ports/sparsepp/portfile.cmake @@ -1,30 +1,28 @@ - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO greg7mdp/sparsepp - REF 1.22 - SHA512 b660cd7de48fcab50d4a0df4e4813226b0b0a8a3791aba4e4cc6a456af7bba0be6694bc44781a7d00b5582b32b1d85b9afa83095b7e5c0a26d1b0344ddc94b0f - HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + REPO greg7mdp/sparsepp + REF 1.22 + SHA512 b660cd7de48fcab50d4a0df4e4813226b0b0a8a3791aba4e4cc6a456af7bba0be6694bc44781a7d00b5582b32b1d85b9afa83095b7e5c0a26d1b0344ddc94b0f + HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) # Note: we could add: OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON # but it's an header only package, so there's no INSTALL target. So # we remove the duplicate headers. -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sparsepp RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/sparsepp/vcpkg.json b/ports/sparsepp/vcpkg.json index 9dda35239a..50d619be5b 100644 --- a/ports/sparsepp/vcpkg.json +++ b/ports/sparsepp/vcpkg.json @@ -1,6 +1,12 @@ { "name": "sparsepp", "version-string": "1.22", - "port-version": 2, - "description": "A fast, memory efficient hash map for C++" + "port-version": 3, + "description": "A fast, memory efficient hash map for C++", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/spdk-dpdk/portfile.cmake b/ports/spdk-dpdk/portfile.cmake index 8c226d6624..45ce0626d6 100644 --- a/ports/spdk-dpdk/portfile.cmake +++ b/ports/spdk-dpdk/portfile.cmake @@ -3,29 +3,28 @@ IF (NOT VCPKG_CMAKE_SYSTEM_NAME OR NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") ENDIF () VCPKG_FROM_GITHUB( - OUT_SOURCE_PATH SOURCE_PATH - REPO spdk/dpdk - REF spdk-18.11 - SHA512 9c069bb0e445f8287ee056452fa32263746f78e27377e8fd75809b9ebf7f25c2395ee13ae4804d8c464e5bc7db7335692759ab3202748dd0c82243aad35e5e7c - HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + REPO spdk/dpdk + REF spdk-18.11 + SHA512 9c069bb0e445f8287ee056452fa32263746f78e27377e8fd75809b9ebf7f25c2395ee13ae4804d8c464e5bc7db7335692759ab3202748dd0c82243aad35e5e7c + HEAD_REF master ) FIND_PATH(NUMA_INCLUDE_DIR NAME numa.h - PATHS ENV NUMA_ROOT - HINTS $ENV{HOME}/local/include /opt/local/include /usr/local/include /usr/include - ) + PATHS ENV NUMA_ROOT + HINTS "$ENV{HOME}/local/include" /opt/local/include /usr/local/include /usr/include +) IF (NOT NUMA_INCLUDE_DIR) MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)") ENDIF () -VCPKG_CONFIGURE_CMAKE( - SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} - PREFER_NINJA - OPTIONS - -DSOURCE_PATH=${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}" + OPTIONS + "-DSOURCE_PATH=${SOURCE_PATH}" ) -VCPKG_INSTALL_CMAKE() +vcpkg_cmake_install() # Headers are symbolic links here, gather all, resolve and copy real files FILE(GLOB_RECURSE HEADERS FOLLOW_SYMLINKS "${SOURCE_PATH}/build/include/*") @@ -35,11 +34,11 @@ FOREACH (HEADER ${HEADERS}) LIST(APPEND REAL_FILES "${REAL_FILE}") ENDFOREACH () -FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/spdk) +FILE(INSTALL "${SOURCE_PATH}/Release/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/spdk") if(NOT VCPKG_BUILD_TYPE) - FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/spdk) + FILE(INSTALL "${SOURCE_PATH}/Debug/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/spdk") endif() -FILE(INSTALL ${REAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdk-dpdkConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -FILE(INSTALL ${SOURCE_PATH}/license/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +FILE(INSTALL ${REAL_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +FILE(INSTALL "${CMAKE_CURRENT_LIST_DIR}/spdk-dpdkConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +FILE(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +FILE(INSTALL "${SOURCE_PATH}/license/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/spdk-dpdk/vcpkg.json b/ports/spdk-dpdk/vcpkg.json index 7c5a2b40da..7727ec2ef1 100644 --- a/ports/spdk-dpdk/vcpkg.json +++ b/ports/spdk-dpdk/vcpkg.json @@ -1,7 +1,13 @@ { "name": "spdk-dpdk", "version-date": "2018-11-24", - "port-version": 2, + "port-version": 3, "description": "SPDK mirror of DPDK. A set of libraries and drivers for fast packet processing", - "supports": "linux" + "supports": "linux", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/spdk-ipsec/portfile.cmake b/ports/spdk-ipsec/portfile.cmake index 456f8a5184..f82f2621d3 100644 --- a/ports/spdk-ipsec/portfile.cmake +++ b/ports/spdk-ipsec/portfile.cmake @@ -35,24 +35,23 @@ IF (NASM_VERSION VERSION_LESS 2.13.03) MESSAGE(FATAL_ERROR "NASM version 2.13.03 (or newer) is required to build this package") ENDIF () -GET_FILENAME_COMPONENT(NASM_PATH ${NASM} DIRECTORY) +GET_FILENAME_COMPONENT(NASM_PATH "${NASM}" DIRECTORY) vcpkg_add_to_path("${NASM_PATH}") -VCPKG_CONFIGURE_CMAKE( - SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}" OPTIONS - -DSOURCE_PATH=${SOURCE_PATH} + "-DSOURCE_PATH=${SOURCE_PATH}" -DEXEC_ENV=${VCPKG_CMAKE_SYSTEM_NAME} ) -VCPKG_INSTALL_CMAKE() +vcpkg_cmake_install() -FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/spdk) +FILE(INSTALL "${SOURCE_PATH}/Release/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/spdk") if(NOT VCPKG_BUILD_TYPE) - FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/spdk) + FILE(INSTALL "${SOURCE_PATH}/Debug/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/spdk") endif() -FILE(INSTALL ${SOURCE_PATH}/Release/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdk-ipsecConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -FILE(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +FILE(INSTALL "${SOURCE_PATH}/Release/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +FILE(INSTALL "${CMAKE_CURRENT_LIST_DIR}/spdk-ipsecConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +FILE(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +FILE(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/spdk-ipsec/vcpkg.json b/ports/spdk-ipsec/vcpkg.json index 0e61066a77..5981ad1ad7 100644 --- a/ports/spdk-ipsec/vcpkg.json +++ b/ports/spdk-ipsec/vcpkg.json @@ -1,7 +1,13 @@ { "name": "spdk-ipsec", "version-date": "2018-07-11", - "port-version": 2, + "port-version": 3, "description": "SPDK mirror of ipsec. Intel(R) Multi-Buffer Crypto for IPsec Library", - "supports": "x64 & linux" + "supports": "x64 & linux", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/spdk/portfile.cmake b/ports/spdk/portfile.cmake index 38c0326fe1..99467f3f21 100644 --- a/ports/spdk/portfile.cmake +++ b/ports/spdk/portfile.cmake @@ -3,36 +3,35 @@ IF (NOT VCPKG_CMAKE_SYSTEM_NAME OR NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") ENDIF () VCPKG_FROM_GITHUB( - OUT_SOURCE_PATH SOURCE_PATH - REPO spdk/spdk - REF v19.01.1 - SHA512 cb2c085e1a5d370df60599aaeb6302f8252626342a9e0644018df8c769f406304591680f905572848390c3139e640496f96e3b4fc67469c56eb9a5329aee4b24 - HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + REPO spdk/spdk + REF v19.01.1 + SHA512 cb2c085e1a5d370df60599aaeb6302f8252626342a9e0644018df8c769f406304591680f905572848390c3139e640496f96e3b4fc67469c56eb9a5329aee4b24 + HEAD_REF master ) FIND_PATH(NUMA_INCLUDE_DIR NAME numa.h - PATHS ENV NUMA_ROOT - HINTS $ENV{HOME}/local/include /opt/local/include /usr/local/include /usr/include - ) + PATHS ENV NUMA_ROOT + HINTS "$ENV{HOME}/local/include" /opt/local/include /usr/local/include /usr/include +) IF (NOT NUMA_INCLUDE_DIR) MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)") ENDIF () -VCPKG_CONFIGURE_CMAKE( - SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} - PREFER_NINJA - OPTIONS - -DSOURCE_PATH=${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}" + OPTIONS + "-DSOURCE_PATH=${SOURCE_PATH}" ) -VCPKG_INSTALL_CMAKE() +vcpkg_cmake_install() -FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -FILE(INSTALL ${SOURCE_PATH}/include/spdk DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -FILE(INSTALL ${SOURCE_PATH}/scripts/setup.sh DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/scripts) -FILE(INSTALL ${SOURCE_PATH}/scripts/common.sh DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/scripts) -FILE(INSTALL ${SOURCE_PATH}/include/spdk/pci_ids.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/include/spdk) -FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdkConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -FILE(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +FILE(INSTALL "${SOURCE_PATH}/Release/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +FILE(INSTALL "${SOURCE_PATH}/Debug/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +FILE(INSTALL "${SOURCE_PATH}/include/spdk" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +FILE(INSTALL "${SOURCE_PATH}/scripts/setup.sh" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/scripts") +FILE(INSTALL "${SOURCE_PATH}/scripts/common.sh" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/scripts") +FILE(INSTALL "${SOURCE_PATH}/include/spdk/pci_ids.h" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/include/spdk") +FILE(INSTALL "${CMAKE_CURRENT_LIST_DIR}/spdkConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +FILE(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +FILE(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/spdk/vcpkg.json b/ports/spdk/vcpkg.json index 90a9c49406..e87acf5ad3 100644 --- a/ports/spdk/vcpkg.json +++ b/ports/spdk/vcpkg.json @@ -1,12 +1,16 @@ { "name": "spdk", "version-string": "19.01.1", - "port-version": 2, + "port-version": 3, "description": "Storage Performance Development Kit", "supports": "linux", "dependencies": [ "spdk-dpdk", "spdk-ipsec", - "spdk-isal" + "spdk-isal", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/spscqueue/portfile.cmake b/ports/spscqueue/portfile.cmake index e1650e852a..cd808db4e8 100644 --- a/ports/spscqueue/portfile.cmake +++ b/ports/spscqueue/portfile.cmake @@ -6,17 +6,16 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SPSCQueue) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPSCQueue) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/spscqueue/vcpkg.json b/ports/spscqueue/vcpkg.json index 9ed6879f33..682705aad7 100644 --- a/ports/spscqueue/vcpkg.json +++ b/ports/spscqueue/vcpkg.json @@ -1,7 +1,17 @@ { "name": "spscqueue", "version-string": "1.1", - "port-version": 1, + "port-version": 2, "description": "A bounded single-producer single-consumer wait-free and lock-free queue written in C++11", - "homepage": "https://github.com/rigtorp/SPSCQueue" + "homepage": "https://github.com/rigtorp/SPSCQueue", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/sratom/portfile.cmake b/ports/sratom/portfile.cmake index a0446c3bec..661b3c4f2a 100644 --- a/ports/sratom/portfile.cmake +++ b/ports/sratom/portfile.cmake @@ -9,16 +9,15 @@ vcpkg_from_gitlab( file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1 ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() file( INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" diff --git a/ports/sratom/vcpkg.json b/ports/sratom/vcpkg.json index 013a4b436c..2b5251e918 100644 --- a/ports/sratom/vcpkg.json +++ b/ports/sratom/vcpkg.json @@ -1,12 +1,21 @@ { "name": "sratom", "version-string": "0.6.4", + "port-version": 1, "description": "Sratom is a library for serialising LV2 atoms to and from RDF, particularly the Turtle syntax.", "homepage": "https://drobilla.net/software/sratom", "license": "ISC", "dependencies": [ "lv2", "serd", - "sord" + "sord", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/status-value-lite/portfile.cmake b/ports/status-value-lite/portfile.cmake index 3e935cd5c3..f5f24e83fc 100644 --- a/ports/status-value-lite/portfile.cmake +++ b/ports/status-value-lite/portfile.cmake @@ -10,21 +10,19 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS test BUILD_TESTS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DNSSV_OPT_BUILD_TESTS=${BUILD_TESTS} -DNSSV_OPT_BUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/status_value-lite) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/status_value-lite) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/status-value-lite/vcpkg.json b/ports/status-value-lite/vcpkg.json index 9850afb430..29ac755109 100644 --- a/ports/status-value-lite/vcpkg.json +++ b/ports/status-value-lite/vcpkg.json @@ -1,9 +1,19 @@ { "name": "status-value-lite", "version-string": "1.1.0", - "port-version": 1, + "port-version": 2, "description": "status_value is a single-file header-only library for objects that represent a status and an optional value. It is intended for use with C++11 and later.", "homepage": "https://github.com/martinmoene/status-value-lite", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "test": { "description": "Build with test" diff --git a/ports/stlab/portfile.cmake b/ports/stlab/portfile.cmake index 8bfecad31d..0760996be7 100644 --- a/ports/stlab/portfile.cmake +++ b/ports/stlab/portfile.cmake @@ -6,22 +6,22 @@ vcpkg_from_github( HEAD_REF develop ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/stlab) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/stlab) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/share/cmake) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/share/cmake") -file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/stlabConfig.cmake STLAB_CONFIG) -string(REPLACE "find_dependency(Boost 1.60.0)" "if(APPLE)\nfind_dependency(Boost)\nendif()" STLAB_CONFIG ${STLAB_CONFIG}) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/stlabConfig.cmake" + "find_dependency(Boost 1.60.0)" + "if(APPLE)\nfind_dependency(Boost)\nendif()" +) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/stlabConfig.cmake "${STLAB_CONFIG}") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/stlab/vcpkg.json b/ports/stlab/vcpkg.json index a3041dca71..691d057720 100644 --- a/ports/stlab/vcpkg.json +++ b/ports/stlab/vcpkg.json @@ -1,7 +1,7 @@ { "name": "stlab", "version-string": "1.6.2", - "port-version": 1, + "port-version": 2, "description": [ "stlab is the ongoing work of what was Adobe Software Technology Lab.", "The Concurrency library provides futures and channels, high level constructs for implementing algorithms that eases the use of multiple CPU cores while minimizing contention. This library solves several problems of the C++11 and C++17 TS futures." @@ -10,6 +10,14 @@ { "name": "boost-variant", "platform": "osx" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/ports/stormlib/portfile.cmake b/ports/stormlib/portfile.cmake index b494d5606f..d0b0c32ea4 100644 --- a/ports/stormlib/portfile.cmake +++ b/ports/stormlib/portfile.cmake @@ -7,17 +7,16 @@ vcpkg_from_github( ) file(COPY - ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt - DESTINATION ${SOURCE_PATH} + "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + DESTINATION "${SOURCE_PATH}" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/stormlib RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets() \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() \ No newline at end of file diff --git a/ports/stormlib/vcpkg.json b/ports/stormlib/vcpkg.json index b293260eca..1b6a60a673 100644 --- a/ports/stormlib/vcpkg.json +++ b/ports/stormlib/vcpkg.json @@ -1,10 +1,18 @@ { "name": "stormlib", "version-string": "2019-05-10", - "port-version": 3, + "port-version": 4, "description": "StormLib is a library for opening and manipulating Blizzard MPQ files", "dependencies": [ "bzip2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/stxxl/portfile.cmake b/ports/stxxl/portfile.cmake index d11b14015e..dfebd3bf01 100644 --- a/ports/stxxl/portfile.cmake +++ b/ports/stxxl/portfile.cmake @@ -12,9 +12,8 @@ vcpkg_from_github( 0001-fix-visual-studio.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_STATIC_LIBS=ON -DBUILD_EXAMPLES=OFF @@ -34,17 +33,17 @@ vcpkg_configure_cmake( -DSTXXL_DEBUG_ASSERTIONS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) endif() vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/share/${PORT}/stxxl-config.cmake + "${CURRENT_PACKAGES_DIR}/share/${PORT}/stxxl-config.cmake" "\${STXXL_CMAKE_DIR}/../include" "\${STXXL_CMAKE_DIR}/../../include" ) @@ -55,19 +54,19 @@ else() set(EXECUTABLE_SUFFIX "") endif() -file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/stxxl_tool${EXECUTABLE_SUFFIX} - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/stxxl_tool${EXECUTABLE_SUFFIX}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/bin - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/bin + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/bin" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/bin" ) # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE_1_0.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) vcpkg_copy_pdbs() diff --git a/ports/stxxl/vcpkg.json b/ports/stxxl/vcpkg.json index 107a432494..dce4ff0ed2 100644 --- a/ports/stxxl/vcpkg.json +++ b/ports/stxxl/vcpkg.json @@ -1,6 +1,16 @@ { "name": "stxxl", "version-date": "2018-11-15", - "port-version": 5, - "description": "Standard Template Library for Extra Large Data Sets" + "port-version": 6, + "description": "Standard Template Library for Extra Large Data Sets", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/suitesparse/portfile.cmake b/ports/suitesparse/portfile.cmake index 44dfa8c362..c8a8c95e86 100644 --- a/ports/suitesparse/portfile.cmake +++ b/ports/suitesparse/portfile.cmake @@ -19,38 +19,37 @@ vcpkg_from_github( # Copy suitesparse sources. message(STATUS "Overwriting SuiteSparseWin source files with SuiteSparse source files...") # Should probably remove everything but CMakeLists.txt files? -file(GLOB SUITESPARSE_SOURCE_FILES ${SOURCE_PATH}/*) +file(GLOB SUITESPARSE_SOURCE_FILES "${SOURCE_PATH}/*") foreach(SOURCE_FILE ${SUITESPARSE_SOURCE_FILES}) - file(COPY ${SOURCE_FILE} DESTINATION "${SUITESPARSEWIN_SOURCE_PATH}/SuiteSparse") + file(COPY "${SOURCE_FILE}" DESTINATION "${SUITESPARSEWIN_SOURCE_PATH}/SuiteSparse") endforeach() message(STATUS "Overwriting SuiteSparseWin source files with SuiteSparse source files... done") message(STATUS "Removing integrated lapack and metis lib...") -file(REMOVE_RECURSE ${SUITESPARSEWIN_SOURCE_PATH}/lapack_windows) -file(REMOVE_RECURSE ${SUITESPARSEWIN_SOURCE_PATH}/SuiteSparse/metis-5.1.0) +file(REMOVE_RECURSE "${SUITESPARSEWIN_SOURCE_PATH}/lapack_windows") +file(REMOVE_RECURSE "${SUITESPARSEWIN_SOURCE_PATH}/SuiteSparse/metis-5.1.0") message(STATUS "Removing integrated lapack and metis lib... done") -vcpkg_configure_cmake( - SOURCE_PATH ${SUITESPARSEWIN_SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SUITESPARSEWIN_SOURCE_PATH}" OPTIONS -DBUILD_METIS=OFF -DUSE_VCPKG_METIS=ON "-DMETIS_SOURCE_DIR=${CURRENT_INSTALLED_DIR}" OPTIONS_DEBUG - -DSUITESPARSE_INSTALL_PREFIX="${CURRENT_PACKAGES_DIR}/debug" + "-DSUITESPARSE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug" OPTIONS_RELEASE - -DSUITESPARSE_INSTALL_PREFIX="${CURRENT_PACKAGES_DIR}" + "-DSUITESPARSE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/suitesparse) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/suitesparse) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SUITESPARSEWIN_SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright_suitesparse-metis-for-windows) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SUITESPARSEWIN_SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright_suitesparse-metis-for-windows) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/cxsparse) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper_cxsparse.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/cxsparse RENAME vcpkg-cmake-wrapper.cmake) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindCXSparse.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/cxsparse) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/cxsparse") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper_cxsparse.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cxsparse" RENAME vcpkg-cmake-wrapper.cmake) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindCXSparse.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cxsparse") diff --git a/ports/suitesparse/vcpkg.json b/ports/suitesparse/vcpkg.json index 71f44d7242..c3a8f25f2e 100644 --- a/ports/suitesparse/vcpkg.json +++ b/ports/suitesparse/vcpkg.json @@ -1,11 +1,19 @@ { "name": "suitesparse", "version-semver": "5.8.0", - "port-version": 1, + "port-version": 2, "description": "A suite of sparse matrix algorithms. Also provides libcxsparse.", "homepage": "http://suitesparse.com", "dependencies": [ "lapack", - "metis" + "metis", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/systemc/portfile.cmake b/ports/systemc/portfile.cmake index e6439eb5c7..157bfc6049 100644 --- a/ports/systemc/portfile.cmake +++ b/ports/systemc/portfile.cmake @@ -6,28 +6,27 @@ vcpkg_download_distfile(ARCHIVE FILENAME "systemc-${SYSTEMC_VERSION}.zip" SHA512 f4df172addf816a1928d411dcab42c1679dc4c9d772f406c10d798a2c174d89cdac7a83947fa8beea1e3aff93da522d2d2daf61a4841ec456af7b7446c5c4a14 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${SYSTEMC_VERSION} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + SOURCE_BASE "${SYSTEMC_VERSION}" PATCHES install.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCMAKE_CXX_STANDARD=17 -DDISABLE_COPYRIGHT_MESSAGE=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SystemCLanguage TARGET_PATH share/systemclanguage) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/SystemCTLM TARGET_PATH share/systemctlm) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SystemCLanguage PACKAGE_NAME systemclanguage) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/SystemCTLM PACKAGE_NAME systemctlm) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/sysc/packages/qt/time) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/sysc/packages/qt/time") -file(INSTALL ${SOURCE_PATH}/NOTICE DESTINATION ${CURRENT_PACKAGES_DIR}/share/systemc RENAME copyright) +file(INSTALL "${SOURCE_PATH}/NOTICE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/systemc/vcpkg.json b/ports/systemc/vcpkg.json index 9f9d743fee..d41c5dec86 100644 --- a/ports/systemc/vcpkg.json +++ b/ports/systemc/vcpkg.json @@ -1,6 +1,16 @@ { "name": "systemc", "version-string": "2.3.3", - "port-version": 6, - "description": "A set of C++ classes and macros which provide an event-driven simulation kernel in C++" + "port-version": 7, + "description": "A set of C++ classes and macros which provide an event-driven simulation kernel in C++", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/tacopie/portfile.cmake b/ports/tacopie/portfile.cmake index 4cf2d73dcb..6a6c4a625d 100644 --- a/ports/tacopie/portfile.cmake +++ b/ports/tacopie/portfile.cmake @@ -7,8 +7,8 @@ vcpkg_from_github( SHA512 079b294b537aaffe3bcf43a485c3be5b15f633c3f7c70140032d60cb010d35b76e76ef4ddd7596f6bfaf3f7edca7cb086c67552efffbf65846e725d7be54ce72 HEAD_REF master PATCHES - ${CMAKE_CURRENT_LIST_DIR}/fix-cmakelists.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-export.patch + fix-cmakelists.patch + fix-export.patch ) if(VCPKG_CRT_LINKAGE STREQUAL dynamic) @@ -23,21 +23,20 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAM set(VCPKG_C_FLAGS_DEBUG "${VCPKG_C_FLAGS_DEBUG} -RTC1") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DMSVC_RUNTIME_LIBRARY_CONFIG=${MSVC_RUNTIME_LIBRARY_CONFIG} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tacopie/vcpkg.json b/ports/tacopie/vcpkg.json index 4c1167a8a6..06b6fd1e6a 100644 --- a/ports/tacopie/vcpkg.json +++ b/ports/tacopie/vcpkg.json @@ -1,7 +1,13 @@ { "name": "tacopie", "version-string": "3.2.0", - "port-version": 3, + "port-version": 4, "description": "Tacopie is a TCP Client & Server C++11 library", - "homepage": "https://github.com/cpp-redis/tacopie" + "homepage": "https://github.com/cpp-redis/tacopie", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/taocpp-json/portfile.cmake b/ports/taocpp-json/portfile.cmake index 653a3d201e..268d18de12 100644 --- a/ports/taocpp-json/portfile.cmake +++ b/ports/taocpp-json/portfile.cmake @@ -8,26 +8,25 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS -DTAOCPP_JSON_BUILD_TESTS=OFF -DTAOCPP_JSON_BUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/taocpp-json/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/taocpp-json/cmake) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/share/doc + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/share/doc" ) # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) -file(COPY ${SOURCE_PATH}/LICENSE.double-conversion DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(COPY ${SOURCE_PATH}/LICENSE.itoa DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(COPY ${SOURCE_PATH}/LICENSE.ryu DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright"COPYONLY) +file(COPY "${SOURCE_PATH}/LICENSE.double-conversion" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${SOURCE_PATH}/LICENSE.itoa" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${SOURCE_PATH}/LICENSE.ryu" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/taocpp-json/vcpkg.json b/ports/taocpp-json/vcpkg.json index b1e5f2fb91..28682b3162 100644 --- a/ports/taocpp-json/vcpkg.json +++ b/ports/taocpp-json/vcpkg.json @@ -1,6 +1,16 @@ { "name": "taocpp-json", "version-string": "2020-09-14", - "port-version": 1, - "description": "C++ header-only JSON library" + "port-version": 2, + "description": "C++ header-only JSON library", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/telnetpp/portfile.cmake b/ports/telnetpp/portfile.cmake index f4a196144e..88fc66ea73 100644 --- a/ports/telnetpp/portfile.cmake +++ b/ports/telnetpp/portfile.cmake @@ -12,24 +12,23 @@ if("zlib" IN_LIST FEATURES) set(USE_ZLIB ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS - -DGSL_INCLUDE_PATH=${CURRENT_INSTALLED_DIR}/include + "-DGSL_INCLUDE_PATH=${CURRENT_INSTALLED_DIR}/include" -DTELNETPP_WITH_ZLIB=${USE_ZLIB} -DTELNETPP_WITH_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/telnetpp) +vcpkg_cmake_config_fixup(CONFIG_PATH share/telnetpp) vcpkg_copy_pdbs() # Remove duplicate header files and CMake input file -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE ${CURRENT_PACKAGES_DIR}/include/telnetpp/version.hpp.in) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/telnetpp/version.hpp.in") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/telnetpp RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/telnetpp/vcpkg.json b/ports/telnetpp/vcpkg.json index b59fcde67f..1eb1cd72e7 100644 --- a/ports/telnetpp/vcpkg.json +++ b/ports/telnetpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "telnetpp", "version-string": "2.1.2", - "port-version": 1, + "port-version": 2, "description": "Telnet++ is an implementation of the Telnet Session Layer protocol using C++14", "homepage": "https://github.com/KazDragon/telnetpp", "supports": "!uwp", @@ -11,7 +11,15 @@ "boost-range", "boost-signals2", "boost-variant", - "gsl-lite" + "gsl-lite", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ "zlib" diff --git a/ports/tfhe/portfile.cmake b/ports/tfhe/portfile.cmake index 6eb77f140c..87e10337e1 100644 --- a/ports/tfhe/portfile.cmake +++ b/ports/tfhe/portfile.cmake @@ -11,14 +11,13 @@ vcpkg_from_github( # Workaround for https://github.com/tfhe/tfhe/issues/246 vcpkg_replace_string("${SOURCE_PATH}/src/CMakeLists.txt" "-Wall -Werror" "") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/src - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/src" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tfhe/vcpkg.json b/ports/tfhe/vcpkg.json index 2053bc996c..91feadf432 100644 --- a/ports/tfhe/vcpkg.json +++ b/ports/tfhe/vcpkg.json @@ -1,8 +1,14 @@ { "name": "tfhe", "version-semver": "1.0.1", - "port-version": 4, + "port-version": 5, "description": "TFHE is open-source software distributed under the terms of the Apache 2.0 license.", "homepage": "https://github.com/tfhe/tfhe", - "supports": "!windows & !arm" + "supports": "!windows & !arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/tgc/portfile.cmake b/ports/tgc/portfile.cmake index 3171461910..087c69ea84 100644 --- a/ports/tgc/portfile.cmake +++ b/ports/tgc/portfile.cmake @@ -8,19 +8,18 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/tgc/vcpkg.json b/ports/tgc/vcpkg.json index 960f3fe19b..bfc5a68295 100644 --- a/ports/tgc/vcpkg.json +++ b/ports/tgc/vcpkg.json @@ -1,7 +1,17 @@ { "name": "tgc", "version-string": "2019-08-11", - "port-version": 2, + "port-version": 3, "description": "A tiny garbage collector for C", - "homepage": "https://github.com/orangeduck/tgc" + "homepage": "https://github.com/orangeduck/tgc", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/tinkerforge/portfile.cmake b/ports/tinkerforge/portfile.cmake index 96f561ae5e..18c11a1a38 100644 --- a/ports/tinkerforge/portfile.cmake +++ b/ports/tinkerforge/portfile.cmake @@ -6,29 +6,28 @@ vcpkg_download_distfile(ARCHIVE SHA512 c02b789bd466803d60aeb39a544b0aa17af811377b065a0b273bcfc15c5844f8cfe981d8143743e32bd05470c2c6af297df50924da0d2895a4cdf4bc9e9bd0b8 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF tinker-${VERSION} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + SOURCE_BASE "tinker-${VERSION}" NO_REMOVE_ONE_LEVEL ) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION ${SOURCE_PATH}) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/tinkerforgeConfig.cmake.in" DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/tinkerforgeConfig.cmake.in" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) -file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/tinkerforge/vcpkg.json b/ports/tinkerforge/vcpkg.json index bc809a76a1..6c423b979b 100644 --- a/ports/tinkerforge/vcpkg.json +++ b/ports/tinkerforge/vcpkg.json @@ -1,7 +1,17 @@ { "name": "tinkerforge", "version": "2.1.25", - "port-version": 2, + "port-version": 3, "description": "Tinkerforge C API bindings for bricks and bricklets", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/tiny-aes-c/portfile.cmake b/ports/tiny-aes-c/portfile.cmake index 80439c1e0b..6883ba8be2 100644 --- a/ports/tiny-aes-c/portfile.cmake +++ b/ports/tiny-aes-c/portfile.cmake @@ -8,18 +8,17 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -configure_file(${SOURCE_PATH}/unlicense.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/unlicense.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/tiny-aes-c/vcpkg.json b/ports/tiny-aes-c/vcpkg.json index d499959578..2357dd1ac4 100644 --- a/ports/tiny-aes-c/vcpkg.json +++ b/ports/tiny-aes-c/vcpkg.json @@ -1,7 +1,17 @@ { "name": "tiny-aes-c", "version-string": "2019-07-31", - "port-version": 1, + "port-version": 2, "description": "Small portable AES128/192/256 in C", - "homepage": "https://github.com/kokke/tiny-AES-c" + "homepage": "https://github.com/kokke/tiny-AES-c", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/tiny-bignum-c/portfile.cmake b/ports/tiny-bignum-c/portfile.cmake index 81bdd55a6e..ea7b41ab86 100644 --- a/ports/tiny-bignum-c/portfile.cmake +++ b/ports/tiny-bignum-c/portfile.cmake @@ -8,18 +8,17 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/tiny-bignum-c/vcpkg.json b/ports/tiny-bignum-c/vcpkg.json index 2d78d4dfd8..383ff92fdf 100644 --- a/ports/tiny-bignum-c/vcpkg.json +++ b/ports/tiny-bignum-c/vcpkg.json @@ -1,7 +1,17 @@ { "name": "tiny-bignum-c", "version-string": "2019-07-31", - "port-version": 1, + "port-version": 2, "description": "Small portable multiple-precision unsigned integer arithmetic in C", - "homepage": "https://github.com/kokke/tiny-bignum-c" + "homepage": "https://github.com/kokke/tiny-bignum-c", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/tiny-regex-c/portfile.cmake b/ports/tiny-regex-c/portfile.cmake index 4a5564cf6e..83b050d213 100644 --- a/ports/tiny-regex-c/portfile.cmake +++ b/ports/tiny-regex-c/portfile.cmake @@ -8,18 +8,17 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/tiny-regex-c/vcpkg.json b/ports/tiny-regex-c/vcpkg.json index c9a39a6af6..3ed8ca1d00 100644 --- a/ports/tiny-regex-c/vcpkg.json +++ b/ports/tiny-regex-c/vcpkg.json @@ -1,7 +1,17 @@ { "name": "tiny-regex-c", "version-string": "2019-07-31", - "port-version": 1, + "port-version": 2, "description": "A small regex implementation in C", - "homepage": "https://github.com/kokke/tiny-regex-c" + "homepage": "https://github.com/kokke/tiny-regex-c", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/tinycthread/portfile.cmake b/ports/tinycthread/portfile.cmake index 2d6c8b18b2..2c1b5c24cb 100644 --- a/ports/tinycthread/portfile.cmake +++ b/ports/tinycthread/portfile.cmake @@ -8,20 +8,19 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DTINYCTHREAD_DISABLE_TESTS=OFF -DTINYCTHREAD_INSTALL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(STRINGS ${SOURCE_PATH}/README.txt SOURCE_LINES) +file(STRINGS "${SOURCE_PATH}/README.txt" SOURCE_LINES) list(SUBLIST SOURCE_LINES 70 120 SOURCE_LINES) list(JOIN SOURCE_LINES "\n" _contents) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "${_contents}") diff --git a/ports/tinycthread/vcpkg.json b/ports/tinycthread/vcpkg.json index d67a40f536..ff8d59ceca 100644 --- a/ports/tinycthread/vcpkg.json +++ b/ports/tinycthread/vcpkg.json @@ -1,7 +1,13 @@ { "name": "tinycthread", "version-string": "2019-08-06", - "port-version": 1, + "port-version": 2, "description": "Small, portable implementation of the C11 threads API", - "homepage": "https://tinycthread.github.io/" + "homepage": "https://tinycthread.github.io/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/tinyexpr/portfile.cmake b/ports/tinyexpr/portfile.cmake index 480c67a24d..968f1befb0 100644 --- a/ports/tinyexpr/portfile.cmake +++ b/ports/tinyexpr/portfile.cmake @@ -8,20 +8,19 @@ vcpkg_from_github( fix-issue-34.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/exports.def DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tinyexpr/vcpkg.json b/ports/tinyexpr/vcpkg.json index 6ed72b483a..1e9b2aeb68 100644 --- a/ports/tinyexpr/vcpkg.json +++ b/ports/tinyexpr/vcpkg.json @@ -1,7 +1,18 @@ { "name": "tinyexpr", "version-string": "2020-09-25", + "port-version": 1, "description": "Tiny recursive descent parser and evaluation engine in C", "homepage": "https://codeplea.com/tinyexpr", - "license": "Zlib" + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/tinynpy/portfile.cmake b/ports/tinynpy/portfile.cmake index 283a91b102..cc9f7780bb 100644 --- a/ports/tinynpy/portfile.cmake +++ b/ports/tinynpy/portfile.cmake @@ -8,21 +8,20 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DBUILD_DEMO=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/TinyNPY") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/TinyNPY") vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinynpy RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tinynpy/vcpkg.json b/ports/tinynpy/vcpkg.json index 438863c474..aa85e17475 100644 --- a/ports/tinynpy/vcpkg.json +++ b/ports/tinynpy/vcpkg.json @@ -1,9 +1,17 @@ { "name": "tinynpy", "version-string": "1.0.0", - "port-version": 4, + "port-version": 5, "description": "tiny C++ loader/exporter of python numpy array NPY/NPZ files", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/tinythread/portfile.cmake b/ports/tinythread/portfile.cmake index 7b29ab146d..0061ee0071 100644 --- a/ports/tinythread/portfile.cmake +++ b/ports/tinythread/portfile.cmake @@ -6,19 +6,18 @@ vcpkg_download_distfile(ARCHIVE SHA512 407f54fcf3f68dd7fec25e9e0749a1803dffa5d52d606905155714d29f519b5eae64ff654b11768fecc32c0123a78c48be37c47993e0caf157a63349a2f869c6 ) -vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(INSTALL "${SOURCE_PATH}/README.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinythread RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tinythread/vcpkg.json b/ports/tinythread/vcpkg.json index 3e45f68b01..2516f97ab1 100644 --- a/ports/tinythread/vcpkg.json +++ b/ports/tinythread/vcpkg.json @@ -1,7 +1,13 @@ { "name": "tinythread", "version-string": "1.1", - "port-version": 4, + "port-version": 5, "description": "Implements a fairly compatible subset of the C++11 thread management classes", - "homepage": "https://tinythreadpp.bitsnbites.eu/" + "homepage": "https://tinythreadpp.bitsnbites.eu/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/tinyxml/portfile.cmake b/ports/tinyxml/portfile.cmake index 1f42e4d75c..024461873f 100644 --- a/ports/tinyxml/portfile.cmake +++ b/ports/tinyxml/portfile.cmake @@ -11,18 +11,17 @@ vcpkg_from_sourceforge( 0002_export_tinyxml.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinyxml RENAME copyright) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/tinyxml-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinyxml) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/tinyxml-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/tinyxml/vcpkg.json b/ports/tinyxml/vcpkg.json index 8ee2d5d2dd..7a84ea10ca 100644 --- a/ports/tinyxml/vcpkg.json +++ b/ports/tinyxml/vcpkg.json @@ -1,7 +1,17 @@ { "name": "tinyxml", "version-string": "2.6.2", - "port-version": 8, + "port-version": 9, "description": "A simple, small, minimal, C++ XML parser that can be easily integrating into other programs.", - "homepage": "https://sourceforge.net/projects/tinyxml" + "homepage": "https://sourceforge.net/projects/tinyxml", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/tl-function-ref/portfile.cmake b/ports/tl-function-ref/portfile.cmake index ea5274796c..942778bea0 100644 --- a/ports/tl-function-ref/portfile.cmake +++ b/ports/tl-function-ref/portfile.cmake @@ -14,18 +14,17 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DFETCHCONTENT_FULLY_DISCONNECTED=ON - -DFETCHCONTENT_SOURCE_DIR_TL_CMAKE=${TL_CMAKE_SOURCE_DIR} + "-DFETCHCONTENT_SOURCE_DIR_TL_CMAKE=${TL_CMAKE_SOURCE_DIR}" -DFUNCTION_REF_ENABLE_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/tl-function-ref RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/tl-function-ref" RENAME copyright) diff --git a/ports/tl-function-ref/vcpkg.json b/ports/tl-function-ref/vcpkg.json index e8cf323a4b..1a58e86da0 100644 --- a/ports/tl-function-ref/vcpkg.json +++ b/ports/tl-function-ref/vcpkg.json @@ -1,6 +1,12 @@ { "name": "tl-function-ref", "version-string": "1.0.0", - "port-version": 2, - "description": "A lightweight, non-owning reference to a callable." + "port-version": 3, + "description": "A lightweight, non-owning reference to a callable.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/tlx/portfile.cmake b/ports/tlx/portfile.cmake index 2ee4ca4f35..7e7eb9caa9 100644 --- a/ports/tlx/portfile.cmake +++ b/ports/tlx/portfile.cmake @@ -12,9 +12,8 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DVERBOSE=1 -DTLX_BUILD_TESTS=off @@ -25,16 +24,16 @@ vcpkg_configure_cmake( -DTLX_BUILD_SHARED_LIBS=${BUILD_SHARED} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake/") + vcpkg_cmake_config_fixup(CONFIG_PATH "CMake/") else() - vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/tlx") + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/tlx") endif() 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/${PORT} RENAME copyright) - -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/tlx/vcpkg.json b/ports/tlx/vcpkg.json index 5433956b11..cf5acdf1ca 100644 --- a/ports/tlx/vcpkg.json +++ b/ports/tlx/vcpkg.json @@ -1,7 +1,17 @@ { "name": "tlx", "version-string": "0.5.20191212", - "port-version": 2, + "port-version": 3, "description": "tlx is a collection of C++ helpers and extensions universally needed, but not found in the STL", - "homepage": "https://github.com/tlx/tlx" + "homepage": "https://github.com/tlx/tlx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/tre/portfile.cmake b/ports/tre/portfile.cmake index d92265c7d7..e6ce5e118e 100644 --- a/ports/tre/portfile.cmake +++ b/ports/tre/portfile.cmake @@ -9,18 +9,17 @@ vcpkg_from_github( ) if(VCPKG_TARGET_IS_MINGW) - vcpkg_replace_string(${SOURCE_PATH}/win32/tre.def "tre.dll" "libtre.dll") + vcpkg_replace_string("${SOURCE_PATH}/win32/tre.def" "tre.dll" "libtre.dll") endif() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tre RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/tre" RENAME copyright) diff --git a/ports/tre/vcpkg.json b/ports/tre/vcpkg.json index 7d072060ff..f4402a1c6b 100644 --- a/ports/tre/vcpkg.json +++ b/ports/tre/vcpkg.json @@ -1,7 +1,13 @@ { "name": "tre", "version": "0.8.0", - "port-version": 4, + "port-version": 5, "description": "TRE is a lightweight, robust, and efficient POSIX compliant regexp matching library with some exciting features such as approximate (fuzzy) matching.", - "homepage": "https://github.com/laurikari/tre" + "homepage": "https://github.com/laurikari/tre", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/treehopper/portfile.cmake b/ports/treehopper/portfile.cmake index c9e9855cef..3b6cfa9c19 100644 --- a/ports/treehopper/portfile.cmake +++ b/ports/treehopper/portfile.cmake @@ -7,18 +7,17 @@ vcpkg_from_github( SHA512 65b748375b798787c8b59f9657151f340920c939c3f079105b9b78f4e3b775125598106c6dfa4feba111a64d30f007003a70110ac767802a7dd1127a25c9fb14 HEAD_REF master) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/C++/API/ - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/C++/API/" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/C++/API/inc/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/Treehopper/) +file(INSTALL "${SOURCE_PATH}/C++/API/inc/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/Treehopper/") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/treehopper/vcpkg.json b/ports/treehopper/vcpkg.json index 822c8c949a..5bb63ce7cf 100644 --- a/ports/treehopper/vcpkg.json +++ b/ports/treehopper/vcpkg.json @@ -1,10 +1,18 @@ { "name": "treehopper", "version-string": "1.11.3", - "port-version": 5, + "port-version": 6, "description": "Treehopper connects the physical world to your computer, tablet, or smartphone.", "homepage": "https://treehopper.io", "dependencies": [ - "libusb" + "libusb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/triangle/portfile.cmake b/ports/triangle/portfile.cmake index 15f027c2cd..505b3d4dd4 100644 --- a/ports/triangle/portfile.cmake +++ b/ports/triangle/portfile.cmake @@ -4,29 +4,28 @@ vcpkg_download_distfile(ARCHIVE_FILE SHA512 c9c1ac527c4bf836ed877b1c5495abf9fd2c453741f4c9698777e23cde939ebf0dd73c84cec64f35a93ca01bff4b86ce32ec559da33e570a0744a764e46d2186 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH NO_REMOVE_ONE_LEVEL - ARCHIVE ${ARCHIVE_FILE} + ARCHIVE "${ARCHIVE_FILE}" PATCHES "enable_64bit_architecture.patch" ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/exports.def DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") -file(INSTALL ${SOURCE_PATH}/README DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/triangle/vcpkg.json b/ports/triangle/vcpkg.json index 29cd788672..76376bf5d5 100644 --- a/ports/triangle/vcpkg.json +++ b/ports/triangle/vcpkg.json @@ -1,8 +1,18 @@ { "name": "triangle", "version": "1.6", - "port-version": 2, + "port-version": 3, "description": "A Two-Dimensional Quality Mesh Generator and Delaunay Triangulator.", "homepage": "http://www.cs.cmu.edu/~quake/triangle.html", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/tsl-hopscotch-map/portfile.cmake b/ports/tsl-hopscotch-map/portfile.cmake index b74e41409f..981e97e25c 100644 --- a/ports/tsl-hopscotch-map/portfile.cmake +++ b/ports/tsl-hopscotch-map/portfile.cmake @@ -5,16 +5,15 @@ vcpkg_from_github( SHA512 944f26fe0faa59b799ddf741c4f86b715934e740bfbb40a157f667eaff07013a35ad40a343b720b36279acefbb5b206a54cfcfec1f6cd052314936d19e5da413 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/ports/tsl-hopscotch-map/vcpkg.json b/ports/tsl-hopscotch-map/vcpkg.json index b3d3792e24..8ddb35275d 100644 --- a/ports/tsl-hopscotch-map/vcpkg.json +++ b/ports/tsl-hopscotch-map/vcpkg.json @@ -1,6 +1,12 @@ { "name": "tsl-hopscotch-map", "version-string": "2.3.0", - "port-version": 1, - "description": "C++ implementation of a fast hash map and hash set using hopscotch hashing" + "port-version": 2, + "description": "C++ implementation of a fast hash map and hash set using hopscotch hashing", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/tsl-ordered-map/portfile.cmake b/ports/tsl-ordered-map/portfile.cmake index 4605d72ebd..65cc50b71b 100644 --- a/ports/tsl-ordered-map/portfile.cmake +++ b/ports/tsl-ordered-map/portfile.cmake @@ -5,16 +5,15 @@ vcpkg_from_github( SHA512 c4789df12db34bba1a1b2e07ada39afd6bfb637d34006675ee7f83253e49b5741d301cebb7c368c7a99311c51304f844a6229d00df3717e346e5fc1254e7721b ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/ports/tsl-ordered-map/vcpkg.json b/ports/tsl-ordered-map/vcpkg.json index 8ce8f079fa..58a063cfe1 100644 --- a/ports/tsl-ordered-map/vcpkg.json +++ b/ports/tsl-ordered-map/vcpkg.json @@ -1,6 +1,12 @@ { "name": "tsl-ordered-map", "version-string": "1.0.0", - "port-version": 1, - "description": "C++ hash map and hash set which preserve the order of insertion" + "port-version": 2, + "description": "C++ hash map and hash set which preserve the order of insertion", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/tsl-sparse-map/portfile.cmake b/ports/tsl-sparse-map/portfile.cmake index 9feba6cc3b..54f75df6b7 100644 --- a/ports/tsl-sparse-map/portfile.cmake +++ b/ports/tsl-sparse-map/portfile.cmake @@ -5,16 +5,15 @@ vcpkg_from_github( SHA512 ad270be66b3d5f96cb0305f0e086807aee1c909dd022c19ca99e5f7a72d5116f2ecb4b67fcb80e8bdb4f98925387d95bdc0bcc450a10b97c61f9b92c681f95b5 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/ports/tsl-sparse-map/vcpkg.json b/ports/tsl-sparse-map/vcpkg.json index ff5229abcc..652f0db08a 100644 --- a/ports/tsl-sparse-map/vcpkg.json +++ b/ports/tsl-sparse-map/vcpkg.json @@ -1,6 +1,12 @@ { "name": "tsl-sparse-map", "version-string": "0.6.2", - "port-version": 1, - "description": "C++ implementation of a memory efficient hash map and hash set" + "port-version": 2, + "description": "C++ implementation of a memory efficient hash map and hash set", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/tweeny/portfile.cmake b/ports/tweeny/portfile.cmake index 9aa0e901ce..21e9261a18 100644 --- a/ports/tweeny/portfile.cmake +++ b/ports/tweeny/portfile.cmake @@ -6,16 +6,15 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH "/lib/cmake/Tweeny/") +vcpkg_cmake_config_fixup(CONFIG_PATH "/lib/cmake/Tweeny/") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake/Tweeny) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake/Tweeny") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tweeny/vcpkg.json b/ports/tweeny/vcpkg.json index a68863b675..b2f3c6c7c5 100644 --- a/ports/tweeny/vcpkg.json +++ b/ports/tweeny/vcpkg.json @@ -1,6 +1,17 @@ { "name": "tweeny", "version": "3.2.0", + "port-version": 1, "description": "A modern C++ tweening library", - "homepage": "https://github.com/mobius3/tweeny" + "homepage": "https://github.com/mobius3/tweeny", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/type-lite/portfile.cmake b/ports/type-lite/portfile.cmake index 421fbf51ec..c30d27741a 100644 --- a/ports/type-lite/portfile.cmake +++ b/ports/type-lite/portfile.cmake @@ -10,21 +10,19 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS test BUILD_TESTS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DTYPE_LITE_OPT_BUILD_TESTS=${BUILD_TESTS} -DTYPE_LITE_OPT_BUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/type-lite/vcpkg.json b/ports/type-lite/vcpkg.json index 9fa6607e1e..58ec0d3580 100644 --- a/ports/type-lite/vcpkg.json +++ b/ports/type-lite/vcpkg.json @@ -1,9 +1,19 @@ { "name": "type-lite", "version-string": "0.1.0", - "port-version": 1, + "port-version": 2, "description": "Strong types for C++98, C++11 and later in a single-file header-only library.", "homepage": "https://github.com/martinmoene/type-lite", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "test": { "description": "Build with test" diff --git a/ports/unittest-cpp/portfile.cmake b/ports/unittest-cpp/portfile.cmake index f962a5b885..886e380d7c 100644 --- a/ports/unittest-cpp/portfile.cmake +++ b/ports/unittest-cpp/portfile.cmake @@ -10,20 +10,19 @@ vcpkg_from_github( fix-include-path.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/UnitTest++) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/unittest-cpp ${CURRENT_PACKAGES_DIR}/share/unittest++) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/UnitTest++) +file(RENAME "${CURRENT_PACKAGES_DIR}/share/unittest-cpp" "${CURRENT_PACKAGES_DIR}/share/unittest++") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # Remove duplicate includes -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_fixup_pkgconfig() diff --git a/ports/unittest-cpp/vcpkg.json b/ports/unittest-cpp/vcpkg.json index 8e48fb8aeb..f9e1024c89 100644 --- a/ports/unittest-cpp/vcpkg.json +++ b/ports/unittest-cpp/vcpkg.json @@ -1,7 +1,17 @@ { "name": "unittest-cpp", "version-semver": "2.0.0", - "port-version": 3, + "port-version": 4, "description": "A lightweight unit testing framework for C++", - "homepage": "https://github.com/unittest-cpp/unittest-cpp" + "homepage": "https://github.com/unittest-cpp/unittest-cpp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/unqlite/portfile.cmake b/ports/unqlite/portfile.cmake index a976c307fb..5bbc84be21 100644 --- a/ports/unqlite/portfile.cmake +++ b/ports/unqlite/portfile.cmake @@ -8,13 +8,12 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/unqlite/vcpkg.json b/ports/unqlite/vcpkg.json index 4efa6c6ca6..4e7532c257 100644 --- a/ports/unqlite/vcpkg.json +++ b/ports/unqlite/vcpkg.json @@ -1,7 +1,14 @@ { "name": "unqlite", "version-string": "1.1.9", + "port-version": 1, "description": "An embedded NoSQL, transactional database engine", "homepage": "https://unqlite.org/", - "license": "BSD-2-Clause" + "license": "BSD-2-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/utfz/portfile.cmake b/ports/utfz/portfile.cmake index d81f1aeb17..780812f9de 100644 --- a/ports/utfz/portfile.cmake +++ b/ports/utfz/portfile.cmake @@ -6,16 +6,14 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Copy the include file -file(COPY ${SOURCE_PATH}/utfz.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY "${SOURCE_PATH}/utfz.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # Handle copyright -file(COPY ${SOURCE_PATH}/license DESTINATION ${CURRENT_PACKAGES_DIR}/share/utfz) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/utfz/license ${CURRENT_PACKAGES_DIR}/share/utfz/copyright) +file(INSTALL "${SOURCE_PATH}/license" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/utfz/vcpkg.json b/ports/utfz/vcpkg.json index 480e32b4d1..987c48d977 100644 --- a/ports/utfz/vcpkg.json +++ b/ports/utfz/vcpkg.json @@ -1,7 +1,13 @@ { "name": "utfz", "version-string": "1.2", - "port-version": 2, + "port-version": 3, "description": "A tiny C++ library for parsing and encoding utf-8", - "homepage": "https://github.com/IMQS/utfz" + "homepage": "https://github.com/IMQS/utfz", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/v-hacd/portfile.cmake b/ports/v-hacd/portfile.cmake index 70148bfb94..c22697eba6 100644 --- a/ports/v-hacd/portfile.cmake +++ b/ports/v-hacd/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_github( fix-cmake.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(LIB_TYPE "SHARED") @@ -24,21 +24,20 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS opencl NO_OPENCL ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DLIB_TYPE=${LIB_TYPE} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/vhacd) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/vhacd) vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/v-hacd/vcpkg.json b/ports/v-hacd/vcpkg.json index 217ee155fb..0cd67b71ae 100644 --- a/ports/v-hacd/vcpkg.json +++ b/ports/v-hacd/vcpkg.json @@ -1,10 +1,20 @@ { "name": "v-hacd", "version": "3.2.0", - "port-version": 3, + "port-version": 4, "description": "The V-HACD library decomposes a 3D surface into a set of \"near\" convex parts.", "homepage": "https://github.com/kmammou/v-hacd", "supports": "!arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "opencl": { "description": "Builds opencl enabled lib", diff --git a/ports/visit-struct/portfile.cmake b/ports/visit-struct/portfile.cmake index a797803ef7..424248a94c 100644 --- a/ports/visit-struct/portfile.cmake +++ b/ports/visit-struct/portfile.cmake @@ -7,19 +7,18 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/visit_struct TARGET_PATH share/visit_struct) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME visit_struct) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(INSTALL ${SOURCE_PATH}/README.md - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/README.md" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/visit-struct/vcpkg.json b/ports/visit-struct/vcpkg.json index 0227710a41..5287e8ecdb 100644 --- a/ports/visit-struct/vcpkg.json +++ b/ports/visit-struct/vcpkg.json @@ -1,6 +1,16 @@ { "name": "visit-struct", "version-string": "1.0", - "port-version": 2, - "description": "A header-only library providing structure visitors for C++11 and C++14" + "port-version": 3, + "description": "A header-only library providing structure visitors for C++11 and C++14", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/vlfeat/portfile.cmake b/ports/vlfeat/portfile.cmake index a075bdef7e..8d88830070 100644 --- a/ports/vlfeat/portfile.cmake +++ b/ports/vlfeat/portfile.cmake @@ -15,19 +15,18 @@ if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") set(USE_AVX OFF) endif() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DUSE_SSE=${USE_SSE} -DUSE_AVX=${USE_AVX} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/vlfeat/vcpkg.json b/ports/vlfeat/vcpkg.json index 0e0c0d78bf..66f89f9537 100644 --- a/ports/vlfeat/vcpkg.json +++ b/ports/vlfeat/vcpkg.json @@ -1,7 +1,17 @@ { "name": "vlfeat", "version-string": "2020-07-10", - "port-version": 1, + "port-version": 2, "description": "An open library of computer vision algorithms", - "homepage": "https://www.vlfeat.org" + "homepage": "https://www.vlfeat.org", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/wepoll/portfile.cmake b/ports/wepoll/portfile.cmake index 8032e6000c..73b488f28c 100644 --- a/ports/wepoll/portfile.cmake +++ b/ports/wepoll/portfile.cmake @@ -13,18 +13,17 @@ vcpkg_from_github( HEAD_REF dist ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/wepoll/vcpkg.json b/ports/wepoll/vcpkg.json index c2d14c6373..23b11269f1 100644 --- a/ports/wepoll/vcpkg.json +++ b/ports/wepoll/vcpkg.json @@ -1,8 +1,14 @@ { "name": "wepoll", "version-string": "1.5.8", - "port-version": 1, + "port-version": 2, "description": "Fast epoll for windows", "homepage": "https://github.com/piscisaureus/wepoll", - "supports": "windows" + "supports": "windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/wordnet/portfile.cmake b/ports/wordnet/portfile.cmake index 59ca680510..1ded2df77b 100644 --- a/ports/wordnet/portfile.cmake +++ b/ports/wordnet/portfile.cmake @@ -8,16 +8,16 @@ vcpkg_download_distfile(ARCHIVE SHA512 9539bc016d710f31d65072bbf5068edffcd735978d8cc6f1b361b19428b97546ef6c7e246e1b6f2ff4557a0885a8305341e35173a6723f0740dda18d097ca248 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${VERSION} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + SOURCE_BASE "${VERSION}" PATCHES fix_gobal_vars_uninit_local_ptr.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/wordnet-config.cmake.in DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/wordnet-config.cmake.in" DESTINATION "${SOURCE_PATH}") if("dbfiles" IN_LIST FEATURES) vcpkg_download_distfile(WORDNET_DICT_DBFILES @@ -26,27 +26,26 @@ if("dbfiles" IN_LIST FEATURES) SHA512 16dca17a87026d8a0b7b4758219cd21a869c3ef3da23ce7875924546f2eacac4c2f376cb271b798b2c458fe8c078fb43d681356e3d9beef40f4bd88d3579394f ) file(REMOVE_RECURSE "${SOURCE_PATH}/dict/") - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH WORDNET_DICT_DBFILES_EX - ARCHIVE ${WORDNET_DICT_DBFILES} - REF 3.1 - WORKING_DIRECTORY ${SOURCE_PATH} + vcpkg_extract_source_archive( + WORDNET_DICT_DBFILES_EX + ARCHIVE "${WORDNET_DICT_DBFILES}" + SOURCE_BASE "3.1" + WORKING_DIRECTORY "${SOURCE_PATH}" ) - file(RENAME ${WORDNET_DICT_DBFILES_EX} "${SOURCE_PATH}/dict") + file(RENAME "${WORDNET_DICT_DBFILES_EX}" "${SOURCE_PATH}/dict") endif() set (WORDNET_DICT_PATH "${CURRENT_PACKAGES_DIR}/tools/${PORT}/dict") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DWORDNET_DICT_PATH=${WORDNET_DICT_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS "-DWORDNET_DICT_PATH=${WORDNET_DICT_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/wordnet RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/wordnet/vcpkg.json b/ports/wordnet/vcpkg.json index ffa68c3f26..68fa0a5c09 100644 --- a/ports/wordnet/vcpkg.json +++ b/ports/wordnet/vcpkg.json @@ -1,8 +1,18 @@ { "name": "wordnet", "version-string": "3.0", - "port-version": 1, + "port-version": 2, "description": "WordNet is a large lexical database of English", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "dbfiles": { "description": "WordNet 3.1 database files" diff --git a/ports/xframe/portfile.cmake b/ports/xframe/portfile.cmake index cb3111bd98..6ca3a00438 100644 --- a/ports/xframe/portfile.cmake +++ b/ports/xframe/portfile.cmake @@ -8,15 +8,14 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/xframe) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/xframe) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/xframe/vcpkg.json b/ports/xframe/vcpkg.json index 663ca1f2a3..bf21d33231 100644 --- a/ports/xframe/vcpkg.json +++ b/ports/xframe/vcpkg.json @@ -1,10 +1,18 @@ { "name": "xframe", "version-string": "0.3.0", - "port-version": 1, + "port-version": 2, "description": "xframe is a dataframe for C++, based on xtensor and xtl.", "homepage": "https://github.com/xtensor-stack/xframe", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "xtensor", "xtl" ] diff --git a/ports/xproperty/portfile.cmake b/ports/xproperty/portfile.cmake index 364f95c50f..f6fb17b8bc 100644 --- a/ports/xproperty/portfile.cmake +++ b/ports/xproperty/portfile.cmake @@ -10,19 +10,18 @@ vcpkg_from_github( fix-target.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTS=OFF -DDOWNLOAD_GTEST=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/xproperty/vcpkg.json b/ports/xproperty/vcpkg.json index 31b7c10940..137b9c071f 100644 --- a/ports/xproperty/vcpkg.json +++ b/ports/xproperty/vcpkg.json @@ -1,9 +1,17 @@ { "name": "xproperty", "version-string": "0.8.1", - "port-version": 1, + "port-version": 2, "description": "Traitlets-like C++ properties and implementation of the observer pattern", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "xtl" ] } diff --git a/ports/xtensor-fftw/portfile.cmake b/ports/xtensor-fftw/portfile.cmake index e7e70a729f..3ff1c022d5 100644 --- a/ports/xtensor-fftw/portfile.cmake +++ b/ports/xtensor-fftw/portfile.cmake @@ -8,9 +8,8 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCOMPILE_WARNINGS=OFF -DBUILD_TESTS=OFF @@ -22,12 +21,12 @@ vcpkg_configure_cmake( -DCOVERAGE=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/xtensor-fftw/vcpkg.json b/ports/xtensor-fftw/vcpkg.json index 8ba4afb3f1..4edda09245 100644 --- a/ports/xtensor-fftw/vcpkg.json +++ b/ports/xtensor-fftw/vcpkg.json @@ -1,11 +1,19 @@ { "name": "xtensor-fftw", "version-string": "2019-11-30", - "port-version": 2, + "port-version": 3, "description": "FFTW bindings for the xtensor C++14 multi-dimensional array library", "homepage": "https://github.com/xtensor-stack/xtensor-fftw", "dependencies": [ "fftw3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "xtensor" ] } diff --git a/ports/xtl/portfile.cmake b/ports/xtl/portfile.cmake index 6dd16a174a..92805da573 100644 --- a/ports/xtl/portfile.cmake +++ b/ports/xtl/portfile.cmake @@ -10,20 +10,19 @@ vcpkg_from_github( fix-fixup-cmake.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTS=OFF -DDOWNLOAD_GTEST=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/xtl/vcpkg.json b/ports/xtl/vcpkg.json index 3570c661fd..852ce3427b 100644 --- a/ports/xtl/vcpkg.json +++ b/ports/xtl/vcpkg.json @@ -1,9 +1,18 @@ { "name": "xtl", "version": "0.7.2", + "port-version": 1, "description": "The x template library", "homepage": "https://github.com/xtensor-stack/xtl", "dependencies": [ - "nlohmann-json" + "nlohmann-json", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/yomm2/portfile.cmake b/ports/yomm2/portfile.cmake index e127c94cb4..889af61672 100644 --- a/ports/yomm2/portfile.cmake +++ b/ports/yomm2/portfile.cmake @@ -7,12 +7,11 @@ vcpkg_from_github( HEAD_REF master PATCHES "fix_find_boost.patch" "fix_uwp_osx.patch" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DYOMM2_ENABLE_EXAMPLES=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/YOMM2) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/YOMM2) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/yomm2/vcpkg.json b/ports/yomm2/vcpkg.json index c1696f6f2a..57cc1c6a1b 100644 --- a/ports/yomm2/vcpkg.json +++ b/ports/yomm2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "yomm2", "version-string": "1.1.2", + "port-version": 1, "description": "YOMM2 is an implementation of open multi-methods.", "homepage": "https://github.com/jll63/yomm2", "dependencies": [ @@ -8,6 +9,14 @@ "boost-integer", "boost-move", "boost-preprocessor", - "boost-type-traits" + "boost-type-traits", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/zkpp/portfile.cmake b/ports/zkpp/portfile.cmake index 5347d7c8c2..25526c053a 100644 --- a/ports/zkpp/portfile.cmake +++ b/ports/zkpp/portfile.cmake @@ -12,15 +12,14 @@ if (NOT "${test_files}" STREQUAL "") file(REMOVE ${test_files}) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() diff --git a/ports/zkpp/vcpkg.json b/ports/zkpp/vcpkg.json index 90453ef931..ee8b127557 100644 --- a/ports/zkpp/vcpkg.json +++ b/ports/zkpp/vcpkg.json @@ -1,11 +1,19 @@ { "name": "zkpp", "version": "0.2.3", - "port-version": 2, + "port-version": 3, "description": "A ZooKeeper client for C++.", "homepage": "https://github.com/tgockel/zookeeper-cpp", "supports": "!windows", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zookeeper" ] } diff --git a/ports/zyre/portfile.cmake b/ports/zyre/portfile.cmake index b73db8ecb5..0559e71553 100644 --- a/ports/zyre/portfile.cmake +++ b/ports/zyre/portfile.cmake @@ -7,15 +7,15 @@ vcpkg_from_github( ) configure_file( - ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in - ${SOURCE_PATH}/builds/cmake/Config.cmake.in + "${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" + "${SOURCE_PATH}/builds/cmake/Config.cmake.in" COPYONLY ) foreach(_cmake_module Findczmq.cmake Findlibzmq.cmake) configure_file( - ${CMAKE_CURRENT_LIST_DIR}/${_cmake_module} - ${SOURCE_PATH}/${_cmake_module} + "${CMAKE_CURRENT_LIST_DIR}/${_cmake_module}" + "${SOURCE_PATH}/${_cmake_module}" COPYONLY ) endforeach() @@ -23,9 +23,8 @@ endforeach() string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZYRE_BUILD_SHARED) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ZYRE_BUILD_STATIC) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DZYRE_BUILD_SHARED=${ZYRE_BUILD_SHARED} @@ -33,34 +32,34 @@ vcpkg_configure_cmake( -DENABLE_DRAFTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) - vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) -elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/cmake/${PORT}) - vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/${PORT}) +if(EXISTS "${CURRENT_PACKAGES_DIR}/CMake") + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/cmake/${PORT}") + vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/${PORT}) endif() file(COPY - ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) vcpkg_copy_tools(TOOL_NAMES zpinger AUTO_CLEAN) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(ZYRE_BUILD_STATIC) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/include/zyre_library.h + "${CURRENT_PACKAGES_DIR}/include/zyre_library.h" "if defined ZYRE_STATIC" "if 1 //if defined ZYRE_STATIC" ) endif() # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) vcpkg_fixup_pkgconfig() diff --git a/ports/zyre/vcpkg.json b/ports/zyre/vcpkg.json index 2abbffdfd4..fac1e8bc59 100644 --- a/ports/zyre/vcpkg.json +++ b/ports/zyre/vcpkg.json @@ -1,10 +1,18 @@ { "name": "zyre", "version-string": "2019-07-07", - "port-version": 3, + "port-version": 4, "description": "An open-source framework for proximity-based peer-to-peer applications", "homepage": "https://github.com/zeromq/zyre", "dependencies": [ - "czmq" + "czmq", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 950d27896e..c508de5217 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6994,11 +6994,11 @@ }, "sais": { "baseline": "2.4.1", - "port-version": 3 + "port-version": 4 }, "sajson": { "baseline": "2018-09-21", - "port-version": 1 + "port-version": 2 }, "sassc": { "baseline": "3.6.2", @@ -7034,7 +7034,7 @@ }, "scnlib": { "baseline": "1.0", - "port-version": 0 + "port-version": 1 }, "scope-guard": { "baseline": "1.0.0", @@ -7066,7 +7066,7 @@ }, "sdl1-net": { "baseline": "1.2.8", - "port-version": 4 + "port-version": 5 }, "sdl2": { "baseline": "2.26.3", @@ -7074,7 +7074,7 @@ }, "sdl2-gfx": { "baseline": "1.0.4", - "port-version": 8 + "port-version": 9 }, "sdl2-image": { "baseline": "2.6.3", @@ -7126,7 +7126,7 @@ }, "septag-sx": { "baseline": "2019-05-07", - "port-version": 3 + "port-version": 4 }, "seqan": { "baseline": "2.4.0", @@ -7134,7 +7134,7 @@ }, "serd": { "baseline": "0.30.4", - "port-version": 0 + "port-version": 1 }, "serdepp": { "baseline": "0.1.4.1", @@ -7142,11 +7142,11 @@ }, "sf2cute": { "baseline": "0.2.0", - "port-version": 2 + "port-version": 3 }, "sfgui": { "baseline": "0.4.0", - "port-version": 5 + "port-version": 6 }, "sfml": { "baseline": "2.5.1", @@ -7154,7 +7154,7 @@ }, "sfsexp": { "baseline": "1.3.1", - "port-version": 0 + "port-version": 1 }, "shader-slang": { "baseline": "0.24.43", @@ -7190,15 +7190,15 @@ }, "shiva-sfml": { "baseline": "1.0", - "port-version": 2 + "port-version": 3 }, "shogun": { "baseline": "6.1.4", - "port-version": 7 + "port-version": 8 }, "signalrclient": { "baseline": "1.0.0-beta1-9", - "port-version": 2 + "port-version": 3 }, "sigslot": { "baseline": "1.0.0", @@ -7262,11 +7262,11 @@ }, "slikenet": { "baseline": "2021-06-07", - "port-version": 1 + "port-version": 2 }, "sltbench": { "baseline": "2.4.0", - "port-version": 0 + "port-version": 1 }, "smf": { "baseline": "0.1.1", @@ -7274,7 +7274,7 @@ }, "smpeg2": { "baseline": "2.0.0", - "port-version": 7 + "port-version": 8 }, "snappy": { "baseline": "1.1.9", @@ -7310,11 +7310,11 @@ }, "soem": { "baseline": "1.4.0", - "port-version": 3 + "port-version": 4 }, "soil": { "baseline": "2021-04-22", - "port-version": 1 + "port-version": 2 }, "soil2": { "baseline": "1.3.0", @@ -7342,7 +7342,7 @@ }, "sord": { "baseline": "0.16.4", - "port-version": 0 + "port-version": 1 }, "soundtouch": { "baseline": "2.3.1", @@ -7354,7 +7354,7 @@ }, "spaceland": { "baseline": "7.8.2", - "port-version": 5 + "port-version": 6 }, "span-lite": { "baseline": "0.10.3", @@ -7366,7 +7366,7 @@ }, "sparsepp": { "baseline": "1.22", - "port-version": 2 + "port-version": 3 }, "spatialite-tools": { "baseline": "5.0.1", @@ -7374,15 +7374,15 @@ }, "spdk": { "baseline": "19.01.1", - "port-version": 2 + "port-version": 3 }, "spdk-dpdk": { "baseline": "2018-11-24", - "port-version": 2 + "port-version": 3 }, "spdk-ipsec": { "baseline": "2018-07-11", - "port-version": 2 + "port-version": 3 }, "spdk-isal": { "baseline": "2018-10-06", @@ -7438,7 +7438,7 @@ }, "spscqueue": { "baseline": "1.1", - "port-version": 1 + "port-version": 2 }, "sqlcipher": { "baseline": "4.5.2", @@ -7478,7 +7478,7 @@ }, "sratom": { "baseline": "0.6.4", - "port-version": 0 + "port-version": 1 }, "srell": { "baseline": "3.010", @@ -7506,7 +7506,7 @@ }, "status-value-lite": { "baseline": "1.1.0", - "port-version": 1 + "port-version": 2 }, "stb": { "baseline": "2022-09-09", @@ -7522,11 +7522,11 @@ }, "stlab": { "baseline": "1.6.2", - "port-version": 1 + "port-version": 2 }, "stormlib": { "baseline": "2019-05-10", - "port-version": 3 + "port-version": 4 }, "strict-variant": { "baseline": "0.5", @@ -7558,11 +7558,11 @@ }, "stxxl": { "baseline": "2018-11-15", - "port-version": 5 + "port-version": 6 }, "suitesparse": { "baseline": "5.8.0", - "port-version": 1 + "port-version": 2 }, "sundials": { "baseline": "6.2.0", @@ -7578,7 +7578,7 @@ }, "systemc": { "baseline": "2.3.3", - "port-version": 6 + "port-version": 7 }, "szip": { "baseline": "2.1.1", @@ -7590,7 +7590,7 @@ }, "tacopie": { "baseline": "3.2.0", - "port-version": 3 + "port-version": 4 }, "taglib": { "baseline": "1.13.0", @@ -7598,7 +7598,7 @@ }, "taocpp-json": { "baseline": "2020-09-14", - "port-version": 1 + "port-version": 2 }, "tap-windows6": { "baseline": "9.21.2-0e30f5c", @@ -7634,7 +7634,7 @@ }, "telnetpp": { "baseline": "2.1.2", - "port-version": 1 + "port-version": 2 }, "tensorflow": { "baseline": "2.10.0", @@ -7662,7 +7662,7 @@ }, "tfhe": { "baseline": "1.0.1", - "port-version": 4 + "port-version": 5 }, "tgbot-cpp": { "baseline": "1.6", @@ -7670,7 +7670,7 @@ }, "tgc": { "baseline": "2019-08-11", - "port-version": 2 + "port-version": 3 }, "tgui": { "baseline": "0.9.5", @@ -7710,15 +7710,15 @@ }, "tinkerforge": { "baseline": "2.1.25", - "port-version": 2 + "port-version": 3 }, "tiny-aes-c": { "baseline": "2019-07-31", - "port-version": 1 + "port-version": 2 }, "tiny-bignum-c": { "baseline": "2019-07-31", - "port-version": 1 + "port-version": 2 }, "tiny-dnn": { "baseline": "2018-10-25", @@ -7730,7 +7730,7 @@ }, "tiny-regex-c": { "baseline": "2019-07-31", - "port-version": 1 + "port-version": 2 }, "tinycbor": { "baseline": "0.6.0", @@ -7738,7 +7738,7 @@ }, "tinycthread": { "baseline": "2019-08-06", - "port-version": 1 + "port-version": 2 }, "tinydir": { "baseline": "1.2.5", @@ -7750,7 +7750,7 @@ }, "tinyexpr": { "baseline": "2020-09-25", - "port-version": 0 + "port-version": 1 }, "tinyexr": { "baseline": "1.0.1", @@ -7766,7 +7766,7 @@ }, "tinynpy": { "baseline": "1.0.0", - "port-version": 4 + "port-version": 5 }, "tinyobjloader": { "baseline": "2.0.0-rc9", @@ -7782,7 +7782,7 @@ }, "tinythread": { "baseline": "1.1", - "port-version": 4 + "port-version": 5 }, "tinytoml": { "baseline": "20180219", @@ -7794,7 +7794,7 @@ }, "tinyxml": { "baseline": "2.6.2", - "port-version": 8 + "port-version": 9 }, "tinyxml2": { "baseline": "9.0.0", @@ -7806,7 +7806,7 @@ }, "tl-function-ref": { "baseline": "1.0.0", - "port-version": 2 + "port-version": 3 }, "tl-generator": { "baseline": "2021-09-28", @@ -7822,7 +7822,7 @@ }, "tlx": { "baseline": "0.5.20191212", - "port-version": 2 + "port-version": 3 }, "tmx": { "baseline": "1.2.0", @@ -7866,7 +7866,7 @@ }, "tre": { "baseline": "0.8.0", - "port-version": 4 + "port-version": 5 }, "tree-sitter": { "baseline": "0.20.6", @@ -7878,11 +7878,11 @@ }, "treehopper": { "baseline": "1.11.3", - "port-version": 5 + "port-version": 6 }, "triangle": { "baseline": "1.6", - "port-version": 2 + "port-version": 3 }, "triton": { "baseline": "0.9", @@ -7894,15 +7894,15 @@ }, "tsl-hopscotch-map": { "baseline": "2.3.0", - "port-version": 1 + "port-version": 2 }, "tsl-ordered-map": { "baseline": "1.0.0", - "port-version": 1 + "port-version": 2 }, "tsl-sparse-map": { "baseline": "0.6.2", - "port-version": 1 + "port-version": 2 }, "ttauri": { "baseline": "0.5.0", @@ -7918,11 +7918,11 @@ }, "tweeny": { "baseline": "3.2.0", - "port-version": 0 + "port-version": 1 }, "type-lite": { "baseline": "0.1.0", - "port-version": 1 + "port-version": 2 }, "type-safe": { "baseline": "0.2.2", @@ -7954,7 +7954,7 @@ }, "unittest-cpp": { "baseline": "2.0.0", - "port-version": 3 + "port-version": 4 }, "unixodbc": { "baseline": "2.3.11", @@ -7962,7 +7962,7 @@ }, "unqlite": { "baseline": "1.1.9", - "port-version": 0 + "port-version": 1 }, "unrar": { "baseline": "6.1.7", @@ -8018,7 +8018,7 @@ }, "utfz": { "baseline": "1.2", - "port-version": 2 + "port-version": 3 }, "uthash": { "baseline": "2.3.0", @@ -8042,7 +8042,7 @@ }, "v-hacd": { "baseline": "3.2.0", - "port-version": 3 + "port-version": 4 }, "v8": { "baseline": "9.1.269.39", @@ -8154,7 +8154,7 @@ }, "visit-struct": { "baseline": "1.0", - "port-version": 2 + "port-version": 3 }, "vk-bootstrap": { "baseline": "0.5", @@ -8166,7 +8166,7 @@ }, "vlfeat": { "baseline": "2020-07-10", - "port-version": 1 + "port-version": 2 }, "vlpp": { "baseline": "1.1.0.0", @@ -8262,7 +8262,7 @@ }, "wepoll": { "baseline": "1.5.8", - "port-version": 1 + "port-version": 2 }, "wg21-linear-algebra": { "baseline": "0.7.2", @@ -8330,7 +8330,7 @@ }, "wordnet": { "baseline": "3.0", - "port-version": 1 + "port-version": 2 }, "workflow": { "baseline": "0.10.5", @@ -8442,7 +8442,7 @@ }, "xframe": { "baseline": "0.3.0", - "port-version": 1 + "port-version": 2 }, "xlnt": { "baseline": "1.5.0", @@ -8474,7 +8474,7 @@ }, "xproperty": { "baseline": "0.8.1", - "port-version": 1 + "port-version": 2 }, "xproto": { "baseline": "2021.5", @@ -8498,7 +8498,7 @@ }, "xtensor-fftw": { "baseline": "2019-11-30", - "port-version": 2 + "port-version": 3 }, "xtensor-io": { "baseline": "0.13.0", @@ -8506,7 +8506,7 @@ }, "xtl": { "baseline": "0.7.2", - "port-version": 0 + "port-version": 1 }, "xtrans": { "baseline": "1.4.0", @@ -8554,7 +8554,7 @@ }, "yomm2": { "baseline": "1.1.2", - "port-version": 0 + "port-version": 1 }, "yyjson": { "baseline": "0.6.0", @@ -8590,7 +8590,7 @@ }, "zkpp": { "baseline": "0.2.3", - "port-version": 2 + "port-version": 3 }, "zlib": { "baseline": "1.2.13", @@ -8642,7 +8642,7 @@ }, "zyre": { "baseline": "2019-07-07", - "port-version": 3 + "port-version": 4 }, "zziplib": { "baseline": "0.13.72", diff --git a/versions/s-/sais.json b/versions/s-/sais.json index 36b41e722f..6077ca3f27 100644 --- a/versions/s-/sais.json +++ b/versions/s-/sais.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "557f4ba1ab3603ba23d82024f83fb41ab4a6e288", + "version-string": "2.4.1", + "port-version": 4 + }, { "git-tree": "b4fb1d4e7743c5f80f03e1b8fe4f1863b9a12e7d", "version-string": "2.4.1", diff --git a/versions/s-/sajson.json b/versions/s-/sajson.json index e454c8364a..fa69fbf92c 100644 --- a/versions/s-/sajson.json +++ b/versions/s-/sajson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7401d8ffce21268a90491dcf853727b9c8ec569c", + "version-string": "2018-09-21", + "port-version": 2 + }, { "git-tree": "38334cbff736462ac7a903cf68c94002d26c2ab4", "version-string": "2018-09-21", diff --git a/versions/s-/scnlib.json b/versions/s-/scnlib.json index 8581c2417d..429cb991d7 100644 --- a/versions/s-/scnlib.json +++ b/versions/s-/scnlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d7e548589e4fb172fd5fbb61bbd9a816d971b92", + "version": "1.0", + "port-version": 1 + }, { "git-tree": "81ca9aa67e4f00245a233d075c9ae95726a2d4e3", "version": "1.0", diff --git a/versions/s-/sdl1-net.json b/versions/s-/sdl1-net.json index efa05962d2..d7ba09100e 100644 --- a/versions/s-/sdl1-net.json +++ b/versions/s-/sdl1-net.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8fcf264bba028ea84bf1a7ed6c0bd63c749bd082", + "version-string": "1.2.8", + "port-version": 5 + }, { "git-tree": "a90f68f29394a4b396760e605d8eb6128af811dc", "version-string": "1.2.8", diff --git a/versions/s-/sdl2-gfx.json b/versions/s-/sdl2-gfx.json index e07af1bbdd..759d0ebf39 100644 --- a/versions/s-/sdl2-gfx.json +++ b/versions/s-/sdl2-gfx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbbde3e3c97c7bca48c0509f20ff3858b6522abc", + "version-string": "1.0.4", + "port-version": 9 + }, { "git-tree": "7654d7969a75b5402533dfbf7bec763dadbe949e", "version-string": "1.0.4", diff --git a/versions/s-/septag-sx.json b/versions/s-/septag-sx.json index bb225d1682..00bdc85e85 100644 --- a/versions/s-/septag-sx.json +++ b/versions/s-/septag-sx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3455654e48ff0abd3dc1babfc0bf163a9f567ed5", + "version-string": "2019-05-07", + "port-version": 4 + }, { "git-tree": "5132e30b4b29133a845eb8a90ad5e1a43bc9c0cd", "version-string": "2019-05-07", diff --git a/versions/s-/serd.json b/versions/s-/serd.json index 5db30a5c66..a29faa2a91 100644 --- a/versions/s-/serd.json +++ b/versions/s-/serd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ad1dbe412b4b19067a792c18f690d84b245eafb", + "version-string": "0.30.4", + "port-version": 1 + }, { "git-tree": "0061d58cfde2c694571f97e44a35075f92975a7d", "version-string": "0.30.4", diff --git a/versions/s-/sf2cute.json b/versions/s-/sf2cute.json index 7515996d0a..93ab863c0f 100644 --- a/versions/s-/sf2cute.json +++ b/versions/s-/sf2cute.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e1ef32c3c0950a30ebd1b857009193245488f9ed", + "version-string": "0.2.0", + "port-version": 3 + }, { "git-tree": "abd8af86e6de2707f8334d767ff543b6dfb3a703", "version-string": "0.2.0", diff --git a/versions/s-/sfgui.json b/versions/s-/sfgui.json index 639b8bc941..4e1c977464 100644 --- a/versions/s-/sfgui.json +++ b/versions/s-/sfgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea3a95c81d38b0cc24db65623c803f45a08fd07e", + "version": "0.4.0", + "port-version": 6 + }, { "git-tree": "50f11f13413cb93d73d44bd0c00787363a00c98c", "version": "0.4.0", diff --git a/versions/s-/sfsexp.json b/versions/s-/sfsexp.json index 8cec388628..676f2ad37d 100644 --- a/versions/s-/sfsexp.json +++ b/versions/s-/sfsexp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1d4e77929ec66c6ce99cbdac03a58202b11d2a2", + "version": "1.3.1", + "port-version": 1 + }, { "git-tree": "ca4335a5797bd0b2510b0fa53b9c3445d6a02a30", "version": "1.3.1", diff --git a/versions/s-/shiva-sfml.json b/versions/s-/shiva-sfml.json index e47011f28f..aec1258e1d 100644 --- a/versions/s-/shiva-sfml.json +++ b/versions/s-/shiva-sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15b34188ab13ed064aabffac0b2faca203b214a1", + "version-string": "1.0", + "port-version": 3 + }, { "git-tree": "a7520a9c88dcd7ab8ba0234191221ae24e06d801", "version-string": "1.0", diff --git a/versions/s-/shogun.json b/versions/s-/shogun.json index 5cbf107c76..c005224590 100644 --- a/versions/s-/shogun.json +++ b/versions/s-/shogun.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3164a64864f9758f6dede7b1ea6bcdb2ae199dd9", + "version-string": "6.1.4", + "port-version": 8 + }, { "git-tree": "13454c6a31030e65fdac9764f8b38c90bf40c9a9", "version-string": "6.1.4", diff --git a/versions/s-/signalrclient.json b/versions/s-/signalrclient.json index b77a0218be..faba98cba9 100644 --- a/versions/s-/signalrclient.json +++ b/versions/s-/signalrclient.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "142a336533806e7d9e1fc0807363be351ecf5286", + "version-string": "1.0.0-beta1-9", + "port-version": 3 + }, { "git-tree": "466bc1dd28c6b14346669c6fae30752db269d08a", "version-string": "1.0.0-beta1-9", diff --git a/versions/s-/slikenet.json b/versions/s-/slikenet.json index 72f5c29378..16e130b137 100644 --- a/versions/s-/slikenet.json +++ b/versions/s-/slikenet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ae52d7161892faf627a65ae14f0700665069daf", + "version-date": "2021-06-07", + "port-version": 2 + }, { "git-tree": "470cffd8e68b737e7131beccd5fc7a87be9c3151", "version-date": "2021-06-07", diff --git a/versions/s-/sltbench.json b/versions/s-/sltbench.json index 134e696fe8..3a39f73285 100644 --- a/versions/s-/sltbench.json +++ b/versions/s-/sltbench.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5df47ef0674021ac20500e87c0b3c19c176fa005", + "version-string": "2.4.0", + "port-version": 1 + }, { "git-tree": "7d051973310c2bd8ed3e9d90f53a9179fd651359", "version-string": "2.4.0", diff --git a/versions/s-/smpeg2.json b/versions/s-/smpeg2.json index 8b264b4ada..5e14b9977c 100644 --- a/versions/s-/smpeg2.json +++ b/versions/s-/smpeg2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a09fe59a859ca99ee652c6bfb0b27cbd4e99a9cd", + "version-string": "2.0.0", + "port-version": 8 + }, { "git-tree": "a42a5beba1ed982d3e6abb94ad6871f06f663d93", "version-string": "2.0.0", diff --git a/versions/s-/soem.json b/versions/s-/soem.json index a758daeb6b..059c56c68b 100644 --- a/versions/s-/soem.json +++ b/versions/s-/soem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "442917830f982b5c1cfcf3a74fd251d92ddab6e9", + "version": "1.4.0", + "port-version": 4 + }, { "git-tree": "cc08020790a9060eb6adaa1e989af4463197854b", "version": "1.4.0", diff --git a/versions/s-/soil.json b/versions/s-/soil.json index 76994b7e0e..6bc567869c 100644 --- a/versions/s-/soil.json +++ b/versions/s-/soil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71412fe0daffe8a8cd06f6d094544291f4ad5e02", + "version-date": "2021-04-22", + "port-version": 2 + }, { "git-tree": "7b4abbbc20cd42bad536a6aee64949a40ec3d850", "version-date": "2021-04-22", diff --git a/versions/s-/sord.json b/versions/s-/sord.json index 9f06f1b3bd..5965caea25 100644 --- a/versions/s-/sord.json +++ b/versions/s-/sord.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43058c5106d4162b43522646df027c913f088e61", + "version-string": "0.16.4", + "port-version": 1 + }, { "git-tree": "f32a79763d994652ab17ffbe7de03b08bd1b4e14", "version-string": "0.16.4", diff --git a/versions/s-/spaceland.json b/versions/s-/spaceland.json index 7d254b1f69..365accca13 100644 --- a/versions/s-/spaceland.json +++ b/versions/s-/spaceland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05079a1eaffbd5cdd7d2fae904816c3dd849ea24", + "version-string": "7.8.2", + "port-version": 6 + }, { "git-tree": "56c00b345d98c60814bf7b00b7a0aea2d3f19852", "version-string": "7.8.2", diff --git a/versions/s-/sparsepp.json b/versions/s-/sparsepp.json index 7cf5810b81..6c14b57e3a 100644 --- a/versions/s-/sparsepp.json +++ b/versions/s-/sparsepp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "37dc23bec7c8cd878b8ab1a808e2a177c0930644", + "version-string": "1.22", + "port-version": 3 + }, { "git-tree": "c262fbb63f9655ba3d1759153e3dce5f502babe6", "version-string": "1.22", diff --git a/versions/s-/spdk-dpdk.json b/versions/s-/spdk-dpdk.json index e98478a4f9..fff0070d10 100644 --- a/versions/s-/spdk-dpdk.json +++ b/versions/s-/spdk-dpdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24a9b15332cd306f695cdeb300828d941bde0c98", + "version-date": "2018-11-24", + "port-version": 3 + }, { "git-tree": "05e56d1ca7edd701503c100d3660605a01416c84", "version-date": "2018-11-24", diff --git a/versions/s-/spdk-ipsec.json b/versions/s-/spdk-ipsec.json index 7858ed1eba..fe51df3b1e 100644 --- a/versions/s-/spdk-ipsec.json +++ b/versions/s-/spdk-ipsec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96309162b093b7440843a1b634acea9d01b7b13f", + "version-date": "2018-07-11", + "port-version": 3 + }, { "git-tree": "8acd8deb0597e3534db4e5c9fc37a1ffb72e2f59", "version-date": "2018-07-11", diff --git a/versions/s-/spdk.json b/versions/s-/spdk.json index fe52ef1f23..84a7795f6d 100644 --- a/versions/s-/spdk.json +++ b/versions/s-/spdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "abacec4925be6e6f4f5a61d48c7bbff7d7016cf2", + "version-string": "19.01.1", + "port-version": 3 + }, { "git-tree": "f5ea399f1e0b77d53593ee78e4f6574c2c53a68c", "version-string": "19.01.1", diff --git a/versions/s-/spscqueue.json b/versions/s-/spscqueue.json index 67404178c5..c69a556dee 100644 --- a/versions/s-/spscqueue.json +++ b/versions/s-/spscqueue.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffd613482d5eb0a109b43a8e0eeae5a83ea4d840", + "version-string": "1.1", + "port-version": 2 + }, { "git-tree": "9a8b323fdedb205fefac81e53240408ac7ece3ee", "version-string": "1.1", diff --git a/versions/s-/sratom.json b/versions/s-/sratom.json index cd4f8572c2..39f1703014 100644 --- a/versions/s-/sratom.json +++ b/versions/s-/sratom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5536e4cc0cc0e24c2e0ada700a5cbcc89b13d0fe", + "version-string": "0.6.4", + "port-version": 1 + }, { "git-tree": "182f7bca04bba50becb7f719b0403033ffd1a9da", "version-string": "0.6.4", diff --git a/versions/s-/status-value-lite.json b/versions/s-/status-value-lite.json index 19cdeaced1..c65a27ae17 100644 --- a/versions/s-/status-value-lite.json +++ b/versions/s-/status-value-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b5ac338ea6bcfa9e1da3c30a068b7ef84c4dd62", + "version-string": "1.1.0", + "port-version": 2 + }, { "git-tree": "81415ecf90da612b36d970777850cfa47ba2e1e8", "version-string": "1.1.0", diff --git a/versions/s-/stlab.json b/versions/s-/stlab.json index a93c471e32..a409884779 100644 --- a/versions/s-/stlab.json +++ b/versions/s-/stlab.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e7a8c754181f223c69b2b67ed3cf928db44e4b9", + "version-string": "1.6.2", + "port-version": 2 + }, { "git-tree": "de92e484fbf56eff04270090cb06452cbe22431b", "version-string": "1.6.2", diff --git a/versions/s-/stormlib.json b/versions/s-/stormlib.json index 24b12b98fd..31f59af4ae 100644 --- a/versions/s-/stormlib.json +++ b/versions/s-/stormlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6041fce722face7562ea7e514f590a6c3e60b2d2", + "version-string": "2019-05-10", + "port-version": 4 + }, { "git-tree": "685e22a5716a953dece56ffccfd4b3102936d175", "version-string": "2019-05-10", diff --git a/versions/s-/stxxl.json b/versions/s-/stxxl.json index 2ad7095874..64edceb780 100644 --- a/versions/s-/stxxl.json +++ b/versions/s-/stxxl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa281074458ae24fb9e0cc56746476d52222fc51", + "version-date": "2018-11-15", + "port-version": 6 + }, { "git-tree": "769f42922523b172d890b697a65096ca47e06ff8", "version-date": "2018-11-15", diff --git a/versions/s-/suitesparse.json b/versions/s-/suitesparse.json index 8e99fa8506..92ee992824 100644 --- a/versions/s-/suitesparse.json +++ b/versions/s-/suitesparse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb26833d46e56ee2e9986294be860acc1e81c074", + "version-semver": "5.8.0", + "port-version": 2 + }, { "git-tree": "4c709290c9cc6e7635c120dbd5cd9d227408a0ab", "version-semver": "5.8.0", diff --git a/versions/s-/systemc.json b/versions/s-/systemc.json index 4102645c38..9f5879f553 100644 --- a/versions/s-/systemc.json +++ b/versions/s-/systemc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "52e920673434754e167ac8136dad29d92069a7a4", + "version-string": "2.3.3", + "port-version": 7 + }, { "git-tree": "c07c9aedd9229f1583602afe462aa9894562462c", "version-string": "2.3.3", diff --git a/versions/t-/tacopie.json b/versions/t-/tacopie.json index 49d37a8fcc..a9c70548b7 100644 --- a/versions/t-/tacopie.json +++ b/versions/t-/tacopie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9eacb6c5a31c44cd1c8707ba92b0acf5133c13a", + "version-string": "3.2.0", + "port-version": 4 + }, { "git-tree": "d65f4f38c50754c208cb959e3d1b0c6956d2bf94", "version-string": "3.2.0", diff --git a/versions/t-/taocpp-json.json b/versions/t-/taocpp-json.json index e4e789af9c..f3400c11d4 100644 --- a/versions/t-/taocpp-json.json +++ b/versions/t-/taocpp-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3ae444025a6267cf41b462f77061757254bc829", + "version-string": "2020-09-14", + "port-version": 2 + }, { "git-tree": "afe8907661864659e89e9fc421415b2687390c03", "version-string": "2020-09-14", diff --git a/versions/t-/telnetpp.json b/versions/t-/telnetpp.json index 0ac6ff7a51..d010324975 100644 --- a/versions/t-/telnetpp.json +++ b/versions/t-/telnetpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b80086b6f36f27c3884929bbbfe0e25416cb2c08", + "version-string": "2.1.2", + "port-version": 2 + }, { "git-tree": "e90806a190428cbf53773ea93d5bdacb7f92f7c0", "version-string": "2.1.2", diff --git a/versions/t-/tfhe.json b/versions/t-/tfhe.json index 6e46314f9d..12b3cf785b 100644 --- a/versions/t-/tfhe.json +++ b/versions/t-/tfhe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d318798f5720b80169fcd4a519221e29b787b3f5", + "version-semver": "1.0.1", + "port-version": 5 + }, { "git-tree": "d620d8f9d52b36f1d703a4b072f7cc51ecc10069", "version-semver": "1.0.1", diff --git a/versions/t-/tgc.json b/versions/t-/tgc.json index 2ce1e70a87..57189f3b1f 100644 --- a/versions/t-/tgc.json +++ b/versions/t-/tgc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8388893f06b6027878f739f9e7d30c9bf74faf61", + "version-string": "2019-08-11", + "port-version": 3 + }, { "git-tree": "753c07ac331209bf362c3818e462493ed6ac5ecb", "version-string": "2019-08-11", diff --git a/versions/t-/tinkerforge.json b/versions/t-/tinkerforge.json index 433a2ef3a6..ed66251b9f 100644 --- a/versions/t-/tinkerforge.json +++ b/versions/t-/tinkerforge.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6baf69c677d63b0d7de046c066a37f2eafb19398", + "version": "2.1.25", + "port-version": 3 + }, { "git-tree": "d9c644023147820bc9c89e9fe9f896e1a5fa0913", "version": "2.1.25", diff --git a/versions/t-/tiny-aes-c.json b/versions/t-/tiny-aes-c.json index 1a915e7830..4e285f5409 100644 --- a/versions/t-/tiny-aes-c.json +++ b/versions/t-/tiny-aes-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "08ce412a6bc1a1318909c6bf40160c64929599fc", + "version-string": "2019-07-31", + "port-version": 2 + }, { "git-tree": "0971fda4965a33a674a28b84035e71e42e57f135", "version-string": "2019-07-31", diff --git a/versions/t-/tiny-bignum-c.json b/versions/t-/tiny-bignum-c.json index 010c784a05..6c61a7a99a 100644 --- a/versions/t-/tiny-bignum-c.json +++ b/versions/t-/tiny-bignum-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ee270199f8de84b30355b48f8342ea917b573ba", + "version-string": "2019-07-31", + "port-version": 2 + }, { "git-tree": "645fb34f304ead370e2f4275b4e6c7120dcaed9e", "version-string": "2019-07-31", diff --git a/versions/t-/tiny-regex-c.json b/versions/t-/tiny-regex-c.json index ddef0c8c06..8f7cfaa3a8 100644 --- a/versions/t-/tiny-regex-c.json +++ b/versions/t-/tiny-regex-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a8827f5b9bb6e24ad3746638423b618cf8a9085", + "version-string": "2019-07-31", + "port-version": 2 + }, { "git-tree": "daa1326555febe3cba226d415bdad4a700f5c9f9", "version-string": "2019-07-31", diff --git a/versions/t-/tinycthread.json b/versions/t-/tinycthread.json index 435653d639..9d719113b3 100644 --- a/versions/t-/tinycthread.json +++ b/versions/t-/tinycthread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29aee6896d4b7a5f2b60a2d97f52082624d0f194", + "version-string": "2019-08-06", + "port-version": 2 + }, { "git-tree": "dc723cd8de47e64e29d617806772f2fac2967e28", "version-string": "2019-08-06", diff --git a/versions/t-/tinyexpr.json b/versions/t-/tinyexpr.json index 90007821bc..d07e1d1358 100644 --- a/versions/t-/tinyexpr.json +++ b/versions/t-/tinyexpr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27a749014c1877a6c9cde48fda29f0128894741b", + "version-string": "2020-09-25", + "port-version": 1 + }, { "git-tree": "4f78e1f22bf3575efef5cab61cd1c7d70049c12c", "version-string": "2020-09-25", diff --git a/versions/t-/tinynpy.json b/versions/t-/tinynpy.json index 2f243c632c..d2a949a1e0 100644 --- a/versions/t-/tinynpy.json +++ b/versions/t-/tinynpy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d762ceb4183ad5e67099a7618346f7588b1b067", + "version-string": "1.0.0", + "port-version": 5 + }, { "git-tree": "747ac11f43b296e46b01d17b69f04d0f782e33eb", "version-string": "1.0.0", diff --git a/versions/t-/tinythread.json b/versions/t-/tinythread.json index b446c0868a..5c210ee11c 100644 --- a/versions/t-/tinythread.json +++ b/versions/t-/tinythread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "987670b38c02ffa4761d1ce547e76f76545aac3c", + "version-string": "1.1", + "port-version": 5 + }, { "git-tree": "8e6a5537675d6cdabb102cdba98a638e75bc3a03", "version-string": "1.1", diff --git a/versions/t-/tinyxml.json b/versions/t-/tinyxml.json index d4060a0ee9..d67aa58647 100644 --- a/versions/t-/tinyxml.json +++ b/versions/t-/tinyxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a26a6fd0c41c77f82aba481a315e3a0f1e3d0eca", + "version-string": "2.6.2", + "port-version": 9 + }, { "git-tree": "27f0b200c75054768b3c6ed538c8bb938083ab67", "version-string": "2.6.2", diff --git a/versions/t-/tl-function-ref.json b/versions/t-/tl-function-ref.json index 3996e5af2d..9e162cc490 100644 --- a/versions/t-/tl-function-ref.json +++ b/versions/t-/tl-function-ref.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6afb229de5666e245476b0ca4152d2073f538a2e", + "version-string": "1.0.0", + "port-version": 3 + }, { "git-tree": "40cb62e51ee41b386626b2f4bbcc8f86b6ad2a03", "version-string": "1.0.0", diff --git a/versions/t-/tlx.json b/versions/t-/tlx.json index 28d3f7c8d3..647a3233b0 100644 --- a/versions/t-/tlx.json +++ b/versions/t-/tlx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e8a25c74e2f56ab5f033191bf7b00eb26084067", + "version-string": "0.5.20191212", + "port-version": 3 + }, { "git-tree": "268aa098ddcd207b076e10ebf1ef398aae834243", "version-string": "0.5.20191212", diff --git a/versions/t-/tre.json b/versions/t-/tre.json index ee9ab2b0cd..ce0b5be280 100644 --- a/versions/t-/tre.json +++ b/versions/t-/tre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "601cf1197e7f531cf374926d949163b9c4bb8331", + "version": "0.8.0", + "port-version": 5 + }, { "git-tree": "576df391c1e53ba1d3e8895ce7965d71b78d8236", "version": "0.8.0", diff --git a/versions/t-/treehopper.json b/versions/t-/treehopper.json index 80c09bf69e..572ae5dbbb 100644 --- a/versions/t-/treehopper.json +++ b/versions/t-/treehopper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3eb869813ca17e782c54f3df95af48cbb47346c", + "version-string": "1.11.3", + "port-version": 6 + }, { "git-tree": "4efe0662e17f2f340bd234604952d75a4d914aec", "version-string": "1.11.3", diff --git a/versions/t-/triangle.json b/versions/t-/triangle.json index f3fae4ed4e..734d6ae2a9 100644 --- a/versions/t-/triangle.json +++ b/versions/t-/triangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b751d577254b617b208ac8e1e828be1a539f8123", + "version": "1.6", + "port-version": 3 + }, { "git-tree": "645a20994580aa49313c0d9ef735ea60caf57976", "version": "1.6", diff --git a/versions/t-/tsl-hopscotch-map.json b/versions/t-/tsl-hopscotch-map.json index eb07bc22c0..d0df7c62d9 100644 --- a/versions/t-/tsl-hopscotch-map.json +++ b/versions/t-/tsl-hopscotch-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb999b94c279946d93639a2d54d3a8972a61519f", + "version-string": "2.3.0", + "port-version": 2 + }, { "git-tree": "a9aea6d276838589846f7f2741359c2ca29c49e4", "version-string": "2.3.0", diff --git a/versions/t-/tsl-ordered-map.json b/versions/t-/tsl-ordered-map.json index 899b0a7e2c..e611a4835b 100644 --- a/versions/t-/tsl-ordered-map.json +++ b/versions/t-/tsl-ordered-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d21077c63a818b22dd0d4f3c1e3d70ebbf6de84", + "version-string": "1.0.0", + "port-version": 2 + }, { "git-tree": "5daf2289228a2a7e03ce57d352e07cb8431184a1", "version-string": "1.0.0", diff --git a/versions/t-/tsl-sparse-map.json b/versions/t-/tsl-sparse-map.json index 5c6130a68a..0a993a39d1 100644 --- a/versions/t-/tsl-sparse-map.json +++ b/versions/t-/tsl-sparse-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "392c1afdb1f4ce3319f631466472de6d16924882", + "version-string": "0.6.2", + "port-version": 2 + }, { "git-tree": "7fb06e7731b0c8231bc6e4807c71c38bee6b18ac", "version-string": "0.6.2", diff --git a/versions/t-/tweeny.json b/versions/t-/tweeny.json index ad25b87d71..cc860d624a 100644 --- a/versions/t-/tweeny.json +++ b/versions/t-/tweeny.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f537ca75e36230988713349dd183b7da62d072b", + "version": "3.2.0", + "port-version": 1 + }, { "git-tree": "07d8448c4d732f5596e87fc25392fc58ac7c1961", "version": "3.2.0", diff --git a/versions/t-/type-lite.json b/versions/t-/type-lite.json index 8e317b7db8..642854a2a5 100644 --- a/versions/t-/type-lite.json +++ b/versions/t-/type-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd2fb158fe4964b9f41777379d19bf0790c76fd4", + "version-string": "0.1.0", + "port-version": 2 + }, { "git-tree": "1393063d013016208c0f3e269034c2f664ea408f", "version-string": "0.1.0", diff --git a/versions/u-/unittest-cpp.json b/versions/u-/unittest-cpp.json index 7bbc55419e..d188aa9394 100644 --- a/versions/u-/unittest-cpp.json +++ b/versions/u-/unittest-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e2e8b9a3b236e9777fb4a549162c4030c11460b", + "version-semver": "2.0.0", + "port-version": 4 + }, { "git-tree": "454c93c4ef93d7661b8bf6743996167f921b687f", "version-semver": "2.0.0", diff --git a/versions/u-/unqlite.json b/versions/u-/unqlite.json index fd9a76687c..e0ead45a2c 100644 --- a/versions/u-/unqlite.json +++ b/versions/u-/unqlite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e62e679c8bef82c536cf33cb6f2a1f842930d98a", + "version-string": "1.1.9", + "port-version": 1 + }, { "git-tree": "b038e5ea1a126a574fa130e8b533ca3d91fe9be8", "version-string": "1.1.9", diff --git a/versions/u-/utfz.json b/versions/u-/utfz.json index db788b6ca6..4f74bc8975 100644 --- a/versions/u-/utfz.json +++ b/versions/u-/utfz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e17e36e3f6a6d86a17ed5633baf9a45e1a4d7ce9", + "version-string": "1.2", + "port-version": 3 + }, { "git-tree": "2897d5bfecd8b5fad871a476cfba4c24f45144cd", "version-string": "1.2", diff --git a/versions/v-/v-hacd.json b/versions/v-/v-hacd.json index cfe1c12b87..01d673b601 100644 --- a/versions/v-/v-hacd.json +++ b/versions/v-/v-hacd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4b4d85577f6e6e7cbcfa0257cdc5f51775e3e47", + "version": "3.2.0", + "port-version": 4 + }, { "git-tree": "c65970db1719a0f4ac77a70859ce0a46a430c54a", "version": "3.2.0", diff --git a/versions/v-/visit-struct.json b/versions/v-/visit-struct.json index 2dc72172e5..110b6eb365 100644 --- a/versions/v-/visit-struct.json +++ b/versions/v-/visit-struct.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3d55a4cdc5320d704eba7c458eed48fe0d59dff", + "version-string": "1.0", + "port-version": 3 + }, { "git-tree": "43d203cd2d29553c9f00cea2d08fe8dba4e6c7e1", "version-string": "1.0", diff --git a/versions/v-/vlfeat.json b/versions/v-/vlfeat.json index 1ebdeb861c..73a685f0f6 100644 --- a/versions/v-/vlfeat.json +++ b/versions/v-/vlfeat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d4ca95a246089f7b15bcbfc6d8e74e364f5f867", + "version-string": "2020-07-10", + "port-version": 2 + }, { "git-tree": "2ae1b6f9b25f1b72e71b824f995c521f71a6081b", "version-string": "2020-07-10", diff --git a/versions/w-/wepoll.json b/versions/w-/wepoll.json index 1dc840347d..b8cec57527 100644 --- a/versions/w-/wepoll.json +++ b/versions/w-/wepoll.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ece0a454c25f5fba81265f1bc66bae4036efdcec", + "version-string": "1.5.8", + "port-version": 2 + }, { "git-tree": "35d772a24598836d3b2dffa94f152d2f143117b8", "version-string": "1.5.8", diff --git a/versions/w-/wordnet.json b/versions/w-/wordnet.json index 63963804ee..0abcb3b713 100644 --- a/versions/w-/wordnet.json +++ b/versions/w-/wordnet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac5ddd0978d9192feed17e2c643d7c8c9451064a", + "version-string": "3.0", + "port-version": 2 + }, { "git-tree": "1302f457b9e1e102c1c3cf190c9fc92da9da1272", "version-string": "3.0", diff --git a/versions/x-/xframe.json b/versions/x-/xframe.json index 05a9a31ea7..42a8f16c9c 100644 --- a/versions/x-/xframe.json +++ b/versions/x-/xframe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0e77fd0b1b188f69a5c08856e518e61845bed7f", + "version-string": "0.3.0", + "port-version": 2 + }, { "git-tree": "7dc9d49f9de1237cea644f835be6631ba0c76c4a", "version-string": "0.3.0", diff --git a/versions/x-/xproperty.json b/versions/x-/xproperty.json index 0d6ce4d943..95e4bae55e 100644 --- a/versions/x-/xproperty.json +++ b/versions/x-/xproperty.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efc510fa8cbd77c3effc463f019d8b7520d5c29b", + "version-string": "0.8.1", + "port-version": 2 + }, { "git-tree": "1acf4b775a462fc93484010247364837b2ea8133", "version-string": "0.8.1", diff --git a/versions/x-/xtensor-fftw.json b/versions/x-/xtensor-fftw.json index b549682111..2624bdbcf1 100644 --- a/versions/x-/xtensor-fftw.json +++ b/versions/x-/xtensor-fftw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0593649089167c5e7e5e8da3d48dc20bbb0e366", + "version-string": "2019-11-30", + "port-version": 3 + }, { "git-tree": "ca6e7889f9ae5d1d9a627d7591e22962cde621c4", "version-string": "2019-11-30", diff --git a/versions/x-/xtl.json b/versions/x-/xtl.json index f3baee90b5..06d85fb16a 100644 --- a/versions/x-/xtl.json +++ b/versions/x-/xtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8255a333f114b449c2578ec70e91970eace40598", + "version": "0.7.2", + "port-version": 1 + }, { "git-tree": "2665b2dcd2f142f932337987817369ae8a377bbe", "version": "0.7.2", diff --git a/versions/y-/yomm2.json b/versions/y-/yomm2.json index 27dd3f3129..5bcc69e8e4 100644 --- a/versions/y-/yomm2.json +++ b/versions/y-/yomm2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "883f87feff25739b1922362bcc35438d86a6454d", + "version-string": "1.1.2", + "port-version": 1 + }, { "git-tree": "5d025f5bb550c4a43b070841b8a48936d0644017", "version-string": "1.1.2", diff --git a/versions/z-/zkpp.json b/versions/z-/zkpp.json index 5cac9127c2..98f69ab86d 100644 --- a/versions/z-/zkpp.json +++ b/versions/z-/zkpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d52d577d20e234d6076c5d3b768849c0279fa54", + "version": "0.2.3", + "port-version": 3 + }, { "git-tree": "bcef2196b5ca1a1cc813c22eb903e5a9677f9eab", "version": "0.2.3", diff --git a/versions/z-/zyre.json b/versions/z-/zyre.json index d32f3b0fd1..b9afab402f 100644 --- a/versions/z-/zyre.json +++ b/versions/z-/zyre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f6439c85ad5a70e10b42f4d4a6f34bc97a3b7fd", + "version-string": "2019-07-07", + "port-version": 4 + }, { "git-tree": "2efde0db3fd2fb13029cd66d585311ac1d6d146b", "version-string": "2019-07-07",