Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 2 commits into from
Oct 9, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e6622a
[v-hacd] Fix cmake patch for include files
FabienPean Sep 15, 2020
3e0cdb5
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ports/v-hacd/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
22 changes: 18 additions & 4 deletions ports/v-hacd/fix-cmake.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down