3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 19:25:27 +08:00
Code Issues Projects Releases Wiki Activity

[v-hacd] Fix cmake patch for include files (#13549)

Browse Source
This commit is contained in:
Fabien Péan 2020-10-09 07:15:17 +02:00 committed by GitHub
parent bb3696ce96
commit d192905986
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports/v-hacd/CONTROL
View File

@ -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

22
ports/v-hacd/fix-cmake.patch
View File

@ -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