From d3783c880340ce7cebec4d64d9dfa75841b387a2 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 28 Jun 2021 00:37:25 -0700 Subject: [PATCH 1/5] [recast] Export unofficial target --- ports/recast/CMakeLists.txt | 3 +++ ports/recast/CONTROL | 4 ---- ports/recast/portfile.cmake | 12 +++++++----- ports/recast/vcpkg.json | 17 +++++++++++++++++ 4 files changed, 27 insertions(+), 9 deletions(-) delete mode 100644 ports/recast/CONTROL create mode 100644 ports/recast/vcpkg.json diff --git a/ports/recast/CMakeLists.txt b/ports/recast/CMakeLists.txt index 5b54f6e208a621..70f728afae01c2 100644 --- a/ports/recast/CMakeLists.txt +++ b/ports/recast/CMakeLists.txt @@ -44,10 +44,13 @@ add_library(recast ${SRC}) install( TARGETS recast + EXPORT unofficial-recast-config LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) +install(EXPORT unofficial-recast-config DESTINATION share/unofficial-recast) + if(NOT DISABLE_INSTALL_HEADERS) install(DIRECTORY DebugUtils/Include/ DESTINATION include/recast/DebugUtils) install(DIRECTORY Detour/Include/ DESTINATION include/recast/Detour) diff --git a/ports/recast/CONTROL b/ports/recast/CONTROL deleted file mode 100644 index 3726b99d501307..00000000000000 --- a/ports/recast/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: recast -Version: 1.5.1-3 -Homepage: https://github.com/recastnavigation/recastnavigation -Description: Navigation-mesh Toolset for Games diff --git a/ports/recast/portfile.cmake b/ports/recast/portfile.cmake index 3b6038e41c5b92..11484caa16b9d1 100644 --- a/ports/recast/portfile.cmake +++ b/ports/recast/portfile.cmake @@ -8,16 +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( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/recast RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-recast CONFIG_PATH share/unofficial-recast) vcpkg_copy_pdbs() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/recast/vcpkg.json b/ports/recast/vcpkg.json new file mode 100644 index 00000000000000..5abe9f93b06f5d --- /dev/null +++ b/ports/recast/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "recast", + "version": "1.5.1", + "port-version": 4, + "description": "Navigation-mesh Toolset for Games", + "homepage": "https://github.com/recastnavigation/recastnavigation", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} From 4c6cb3370f8d1dfb14d655f4f3d47e615a65bd6b Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 28 Jun 2021 00:38:30 -0700 Subject: [PATCH 2/5] update version record --- versions/baseline.json | 8 ++++---- versions/r-/recast.json | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index be3a643283f6b7..61df095ff6fe1d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3539,8 +3539,8 @@ "libsigcpp-3": { "baseline": "3.0.3", "port-version": 1 - }, - "libsmb2": { + }, + "libsmb2": { "baseline": "2021-04-29", "port-version": 0 }, @@ -5469,8 +5469,8 @@ "port-version": 1 }, "recast": { - "baseline": "1.5.1-3", - "port-version": 0 + "baseline": "1.5.1", + "port-version": 4 }, "redis-plus-plus": { "baseline": "1.2.3", diff --git a/versions/r-/recast.json b/versions/r-/recast.json index d4fcf997122c22..f8733132aeda1a 100644 --- a/versions/r-/recast.json +++ b/versions/r-/recast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "949b280dbfefbc4ad6c1af2141e2632786baa30d", + "version": "1.5.1", + "port-version": 4 + }, { "git-tree": "41f8cc06fc981d330671b88e08d02de55934155c", "version-string": "1.5.1-3", From 7fa34605fbbb0ba43a0f484ff8deb8277f31d15b Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 28 Jun 2021 19:57:38 -0700 Subject: [PATCH 3/5] Export INTERFACE_INCLUDE_DIRECTORIES --- ports/recast/CMakeLists.txt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/ports/recast/CMakeLists.txt b/ports/recast/CMakeLists.txt index 70f728afae01c2..389fc86fbde929 100644 --- a/ports/recast/CMakeLists.txt +++ b/ports/recast/CMakeLists.txt @@ -1,14 +1,6 @@ cmake_minimum_required(VERSION 3.8) project(recast) -include_directories( - DebugUtils/Include - Detour/Include - DetourCrowd/Include - DetourTileCache/Include - Recast/Include -) - set(SRC DebugUtils/Source/DebugDraw.cpp DebugUtils/Source/DetourDebugDraw.cpp @@ -42,6 +34,16 @@ set(SRC add_library(recast ${SRC}) +target_include_directories( + recast PUBLIC + $ + $ + $ + $ + $ + $ +) + install( TARGETS recast EXPORT unofficial-recast-config From 444d9103961e49a7ef5ed1efc7864e5ee0de2520 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 28 Jun 2021 20:02:17 -0700 Subject: [PATCH 4/5] Export more include dirs. --- ports/recast/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ports/recast/CMakeLists.txt b/ports/recast/CMakeLists.txt index 389fc86fbde929..7ccc0828a1f31b 100644 --- a/ports/recast/CMakeLists.txt +++ b/ports/recast/CMakeLists.txt @@ -42,6 +42,11 @@ target_include_directories( $ $ $ + $ + $ + $ + $ + $ ) install( From 691c276960b1dc89a3e49a0020f95afd31c8b728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 29 Jun 2021 14:49:52 +0800 Subject: [PATCH 5/5] Update versions/r-/recast.json --- versions/r-/recast.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/r-/recast.json b/versions/r-/recast.json index f8733132aeda1a..82f778cd71bafd 100644 --- a/versions/r-/recast.json +++ b/versions/r-/recast.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "949b280dbfefbc4ad6c1af2141e2632786baa30d", + "git-tree": "2f34af0b398b4c37f0cdf3fcd8dc9db965e4dd5e", "version": "1.5.1", "port-version": 4 },