diff --git a/ports/ptex/CONTROL b/ports/ptex/CONTROL deleted file mode 100644 index c00a1a0b81..0000000000 --- a/ports/ptex/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: ptex -Version: 2.3.2 -Port-Version: 2 -Homepage: https://github.com/wdas/ptex -Description: Per-Face Texture Mapping for Production Rendering. -Build-Depends: zlib -Supports: !uwp \ No newline at end of file diff --git a/ports/ptex/portfile.cmake b/ports/ptex/portfile.cmake index f065e4426f..6fe24666be 100644 --- a/ports/ptex/portfile.cmake +++ b/ports/ptex/portfile.cmake @@ -21,29 +21,29 @@ else() set(BUILD_STATIC_LIB ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DPTEX_VER=v${PTEX_VER} -DPTEX_BUILD_SHARED_LIBS=${BUILD_SHARED_LIB} -DPTEX_BUILD_STATIC_LIBS=${BUILD_STATIC_LIB} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/Ptex) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/Ptex) vcpkg_copy_pdbs() foreach(HEADER PtexHalf.h Ptexture.h) - file(READ ${CURRENT_PACKAGES_DIR}/include/${HEADER} PTEX_HEADER) + file(READ "${CURRENT_PACKAGES_DIR}/include/${HEADER}" PTEX_HEADER) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) string(REPLACE "ifndef PTEX_STATIC" "if 1" PTEX_HEADER "${PTEX_HEADER}") else() string(REPLACE "ifndef PTEX_STATIC" "if 0" PTEX_HEADER "${PTEX_HEADER}") endif() - file(WRITE ${CURRENT_PACKAGES_DIR}/include/${HEADER} "${PTEX_HEADER}") + file(WRITE "${CURRENT_PACKAGES_DIR}/include/${HEADER}" "${PTEX_HEADER}") endforeach() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -# Handle copyright -file(INSTALL ${SOURCE_PATH}/src/doc/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/src/doc/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ptex/vcpkg.json b/ports/ptex/vcpkg.json new file mode 100644 index 0000000000..355a40596c --- /dev/null +++ b/ports/ptex/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "ptex", + "version": "2.3.2", + "port-version": 3, + "description": "Per-Face Texture Mapping for Production Rendering.", + "homepage": "https://github.com/wdas/ptex", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/ports/rbdl-orb/portfile.cmake b/ports/rbdl-orb/portfile.cmake index ac829c62ce..02da8be078 100644 --- a/ports/rbdl-orb/portfile.cmake +++ b/ports/rbdl-orb/portfile.cmake @@ -1,12 +1,16 @@ -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC) - +if (EXISTS "${CURRENT_INSTALLED_DIR}/share/rbdl/copyright") + message(FATAL_ERROR "${PORT} conflict with rbdl, please remove rbdl before install ${PORT}.") +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ORB-HD/rbdl-orb REF b22abab856a90dbc62e6b2e79f148bd383b5ce43 SHA512 744a60145243454a9d148971d998ae7a3cc5b9d66131b5d6f3c7be80d6c9ef8b8bf4390b9d1b90b14be6c619c2e1d14c7c6104b3ca6e606e22e3581b548e4f9d HEAD_REF master -) +) vcpkg_from_github( OUT_SOURCE_PATH PARSER_SOURCE_PATH @@ -17,10 +21,10 @@ vcpkg_from_github( if(NOT EXISTS "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser/CMakeLists.txt") file(REMOVE_RECURSE "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser") file(RENAME "${PARSER_SOURCE_PATH}" "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser") -endif() +endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DRBDL_BUILD_STATIC=${RBDL_STATIC} -DRBDL_BUILD_ADDON_LUAMODEL=ON @@ -31,10 +35,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -# # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -# # Remove duplicated include directory file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/rbdl-orb/vcpkg.json b/ports/rbdl-orb/vcpkg.json index 2a1cd6beb9..8b460557a6 100644 --- a/ports/rbdl-orb/vcpkg.json +++ b/ports/rbdl-orb/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rbdl-orb", "version": "3.0.0", + "port-version": 1, "description": "Rigid Body Dynamics Library - ORB", "homepage": "https://github.com/orb-hd/rbdl-orb", "dependencies": [ @@ -10,10 +11,6 @@ { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ] } diff --git a/ports/rbdl/CONTROL b/ports/rbdl/CONTROL deleted file mode 100644 index 1a674323c5..0000000000 --- a/ports/rbdl/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: rbdl -Version: 2.6.0 -Port-Version: 0 -Homepage: https://github.com/rbdl/rbdl -Description: Rigid Body Dynamics Library -Build-Depends: eigen3 diff --git a/ports/rbdl/portfile.cmake b/ports/rbdl/portfile.cmake index adf580e6dc..362bb19bdd 100644 --- a/ports/rbdl/portfile.cmake +++ b/ports/rbdl/portfile.cmake @@ -1,9 +1,9 @@ -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(RBDL_STATIC ON) -else() - set(RBDL_STATIC OFF) +if (EXISTS "${CURRENT_INSTALLED_DIR}/share/rbdl-orb/copyright") + message(FATAL_ERROR "${PORT} conflict with rbdl-orb, please remove rbdl-orb before install ${PORT}.") endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC) + vcpkg_from_github(ARCHIVE OUT_SOURCE_PATH SOURCE_PATH REPO rbdl/rbdl @@ -14,19 +14,16 @@ vcpkg_from_github(ARCHIVE ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DRBDL_BUILD_STATIC=${RBDL_STATIC} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -# # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -# # Remove duplicated include directory file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/rbdl/vcpkg.json b/ports/rbdl/vcpkg.json new file mode 100644 index 0000000000..ee07f6de76 --- /dev/null +++ b/ports/rbdl/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "rbdl", + "version": "2.6.0", + "port-version": 1, + "description": "Rigid Body Dynamics Library", + "homepage": "https://github.com/rbdl/rbdl", + "dependencies": [ + "eigen3", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f7d11a695f..7f53972bc5 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1325,6 +1325,16 @@ rapidstring:x86-windows=fail raylib:arm64-windows=fail raylib:arm-uwp=fail raylib:x64-uwp=fail +# file conflicts with rbdl +rbdl-orb:x86-windows=skip +rbdl-orb:x64-windows=skip +rbdl-orb:x64-windows-static=skip +rbdl-orb:x64-windows-static-md=skip +rbdl-orb:x64-uwp=skip +rbdl-orb:arm-uwp=skip +rbdl-orb:arm64-windows=skip +rbdl-orb:x64-linux=skip +rbdl-orb:x64-osx=skip readline:arm-uwp=fail readline:x64-uwp=fail readline-win32:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 2769193a0f..5897e401d8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5102,7 +5102,7 @@ }, "ptex": { "baseline": "2.3.2", - "port-version": 2 + "port-version": 3 }, "pthread": { "baseline": "3.0.0", @@ -5530,11 +5530,11 @@ }, "rbdl": { "baseline": "2.6.0", - "port-version": 0 + "port-version": 1 }, "rbdl-orb": { "baseline": "3.0.0", - "port-version": 0 + "port-version": 1 }, "re2": { "baseline": "2020-10-01", diff --git a/versions/p-/ptex.json b/versions/p-/ptex.json index 3a7baab15f..47f9c2dcab 100644 --- a/versions/p-/ptex.json +++ b/versions/p-/ptex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c524a2ab1940315d3481e9fbf745425caf5b7c15", + "version": "2.3.2", + "port-version": 3 + }, { "git-tree": "e4ee03f1ba1d9c807b8baee1bd3b1089e71476ca", "version-string": "2.3.2", diff --git a/versions/r-/rbdl-orb.json b/versions/r-/rbdl-orb.json index 0b2c7b6ae0..f2ec0ef61c 100644 --- a/versions/r-/rbdl-orb.json +++ b/versions/r-/rbdl-orb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5850c6901f4123803184bfe9b6e587af9350331a", + "version": "3.0.0", + "port-version": 1 + }, { "git-tree": "d475aade9be86281a6db741ee68e30a23d0f16d3", "version": "3.0.0", diff --git a/versions/r-/rbdl.json b/versions/r-/rbdl.json index 2091d05bbe..832ea5af49 100644 --- a/versions/r-/rbdl.json +++ b/versions/r-/rbdl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44606d1a4e33112ca45274e823041ad877e62623", + "version": "2.6.0", + "port-version": 1 + }, { "git-tree": "c2823f8341acd1e564485661989fb3780a6b4a2a", "version-string": "2.6.0",