diff options
| author | Fabien Péan <fabien@pean.pro> | 2020-10-09 07:15:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-08 22:15:17 -0700 |
| commit | d1929059861f183ec8c50dc114442a08aa7b2e8d (patch) | |
| tree | b0932cceb4fbab8323e5d8524e97c5ed7cfb7784 | |
| parent | bb3696ce96f1429a40867e9cb2aa89a1ce3dfd87 (diff) | |
| download | vcpkg-d1929059861f183ec8c50dc114442a08aa7b2e8d.tar.gz vcpkg-d1929059861f183ec8c50dc114442a08aa7b2e8d.zip | |
[v-hacd] Fix cmake patch for include files (#13549)
| -rw-r--r-- | ports/v-hacd/CONTROL | 1 | ||||
| -rw-r--r-- | ports/v-hacd/fix-cmake.patch | 22 |
2 files changed, 19 insertions, 4 deletions
diff --git a/ports/v-hacd/CONTROL b/ports/v-hacd/CONTROL index 533ea6e09..c642eae7a 100644 --- a/ports/v-hacd/CONTROL +++ b/ports/v-hacd/CONTROL @@ -1,5 +1,6 @@ Source: v-hacd
Version: 3.2.0
+Port-Version: 1
Homepage: https://github.com/kmammou/v-hacd
Description: The V-HACD library decomposes a 3D surface into a set of "near" convex parts.
Supports: !arm
diff --git a/ports/v-hacd/fix-cmake.patch b/ports/v-hacd/fix-cmake.patch index 17ee4bbeb..46c53da11 100644 --- a/ports/v-hacd/fix-cmake.patch +++ b/ports/v-hacd/fix-cmake.patch @@ -21,7 +21,7 @@ diff --git a/src/VHACD_Lib/CMakeLists.txt b/src/VHACD_Lib/CMakeLists.txt index 46fc1b1..2260fdc 100644
--- a/src/VHACD_Lib/CMakeLists.txt
+++ b/src/VHACD_Lib/CMakeLists.txt
-@@ -1,34 +1,36 @@
+@@ -1,77 +1,79 @@
+cmake_minimum_required(VERSION 3.10.0)
+
project(VHACD_LIB CXX C)
@@ -65,13 +65,23 @@ index 46fc1b1..2260fdc 100644 -
target_include_directories(vhacd PUBLIC
-+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/public/>)
++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/public/>
++ $<INSTALL_INTERFACE:include>)
+
+target_include_directories(vhacd PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc/>
- $<INSTALL_INTERFACE:include/> # <prefix>/include/mylib
+- $<INSTALL_INTERFACE:include/> # <prefix>/include/mylib
)
-@@ -43,32 +45,32 @@ install(FILES ${PROJECT_INL_FILES} DESTINATION include)
+
+
+ message("[VHACD] \t -> CMAKE_INSTALL_PREFIX " ${CMAKE_INSTALL_PREFIX})
+ install(TARGETS vhacd EXPORT vhacd-targets DESTINATION lib)
+-install(FILES ${PROJECT_INC_FILES} DESTINATION include)
+-install(FILES ${PROJECT_INL_FILES} DESTINATION include)
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/public/VHACD.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/)
++
+
+
set(VHACD_LIB_VERSION 3.2.0)
include(CMakePackageConfigHelpers)
write_basic_package_version_file(
@@ -112,6 +122,10 @@ index 46fc1b1..2260fdc 100644 DESTINATION
${ConfigPackageLocation}
COMPONENT
+ Devel
+ )
+
+
diff --git a/src/VHACD_Lib/cmake/vhacd-config.cmake b/src/VHACD_Lib/cmake/vhacd-config.cmake
index 8fc5c58..7677f58 100644
--- a/src/VHACD_Lib/cmake/vhacd-config.cmake
|