From 680b27d15f4d62bc6181fd33dc5259482b0890b1 Mon Sep 17 00:00:00 2001
From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Date: Thu, 10 Jun 2021 08:07:01 +0800
Subject: [orocos-kdl] Export include path to targets (#18203)

* [orocos-kdl] Export include path to targets

* Update version files
---
 ports/orocos-kdl/CONTROL                  |  6 ------
 ports/orocos-kdl/export-include-dir.patch | 13 +++++++++++++
 ports/orocos-kdl/portfile.cmake           |  8 +++-----
 ports/orocos-kdl/vcpkg.json               | 10 ++++++++++
 versions/baseline.json                    |  2 +-
 versions/o-/orocos-kdl.json               |  5 +++++
 6 files changed, 32 insertions(+), 12 deletions(-)
 delete mode 100644 ports/orocos-kdl/CONTROL
 create mode 100644 ports/orocos-kdl/export-include-dir.patch
 create mode 100644 ports/orocos-kdl/vcpkg.json

diff --git a/ports/orocos-kdl/CONTROL b/ports/orocos-kdl/CONTROL
deleted file mode 100644
index 1270962d7..000000000
--- a/ports/orocos-kdl/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: orocos-kdl
-Version: 1.4
-Port-Version: 3
-Homepage: https://github.com/orocos/orocos_kinematics_dynamics
-Description: Kinematics and Dynamics Library
-Build-Depends: eigen3
diff --git a/ports/orocos-kdl/export-include-dir.patch b/ports/orocos-kdl/export-include-dir.patch
new file mode 100644
index 000000000..8c75f5675
--- /dev/null
+++ b/ports/orocos-kdl/export-include-dir.patch
@@ -0,0 +1,13 @@
+diff --git a/orocos_kdl/src/CMakeLists.txt b/orocos_kdl/src/CMakeLists.txt
+index 079ca8a..07eff4f 100644
+--- a/orocos_kdl/src/CMakeLists.txt
++++ b/orocos_kdl/src/CMakeLists.txt
+@@ -126,7 +126,7 @@ ENDIF()
+ #####end RPATH
+ 
+ # Needed so that the generated config.h can be used
+-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++TARGET_INCLUDE_DIRECTORIES(orocos-kdl PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> $<INSTALL_INTERFACE:include>)
+ TARGET_LINK_LIBRARIES(orocos-kdl ${Boost_LIBRARIES})
+ 
+ INSTALL(TARGETS orocos-kdl
diff --git a/ports/orocos-kdl/portfile.cmake b/ports/orocos-kdl/portfile.cmake
index 7f41c3847..784987f7b 100644
--- a/ports/orocos-kdl/portfile.cmake
+++ b/ports/orocos-kdl/portfile.cmake
@@ -4,14 +4,12 @@ vcpkg_from_github(
     REF v1.4.0
     SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
     HEAD_REF master
+    PATCHES export-include-dir.patch
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/orocos_kdl
-    PREFER_NINJA # Disable this option if project cannot be built with Ninja
-    # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
-    # OPTIONS_RELEASE -DOPTIMIZE=1
-    # OPTIONS_DEBUG -DDEBUGGABLE=1
+    PREFER_NINJA
 )
 
 vcpkg_install_cmake()
@@ -29,4 +27,4 @@ file(REMOVE_RECURSE
   ${CURRENT_PACKAGES_DIR}/share/doc
   ${CURRENT_PACKAGES_DIR}/doc/liborocos-kdl)
 
-file(INSTALL ${SOURCE_PATH}/orocos_kdl/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/orocos_kdl/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
diff --git a/ports/orocos-kdl/vcpkg.json b/ports/orocos-kdl/vcpkg.json
new file mode 100644
index 000000000..4535b0f93
--- /dev/null
+++ b/ports/orocos-kdl/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "orocos-kdl",
+  "version": "1.4",
+  "port-version": 4,
+  "description": "Kinematics and Dynamics Library.",
+  "homepage": "https://github.com/orocos/orocos_kinematics_dynamics",
+  "dependencies": [
+    "eigen3"
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index a590b45be..b346ec608 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4654,7 +4654,7 @@
     },
     "orocos-kdl": {
       "baseline": "1.4",
-      "port-version": 3
+      "port-version": 4
     },
     "osg": {
       "baseline": "3.6.5",
diff --git a/versions/o-/orocos-kdl.json b/versions/o-/orocos-kdl.json
index b3da44980..1dec315b2 100644
--- a/versions/o-/orocos-kdl.json
+++ b/versions/o-/orocos-kdl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c882240643c0748d609a52adec04abd93ffc120e",
+      "version": "1.4",
+      "port-version": 4
+    },
     {
       "git-tree": "dc60323664cfc26eb992383022f99d5ec1b6c25c",
       "version-string": "1.4",
-- 
cgit v1.2.3