diff options
| author | Akash <Ace314159@users.noreply.github.com> | 2021-07-22 17:00:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 15:00:49 -0700 |
| commit | d12cbb40ed3eb0eb60b844585f57a5d0b6ed0c23 (patch) | |
| tree | 47742301a5fbd2501a0a657105dd0cbb35184a72 /ports/ccd | |
| parent | 2a0c48a32dc82fe4416605fae8ac897bc2dab4da (diff) | |
| download | vcpkg-d12cbb40ed3eb0eb60b844585f57a5d0b6ed0c23.tar.gz vcpkg-d12cbb40ed3eb0eb60b844585f57a5d0b6ed0c23.zip | |
[ompl] Fix linking using ${OMPL_LIBRARIES} (#18908)
* Fix _IMPORT_PREFIX
* Export cmake targets file
* Fix config
* Make separate omplapp port
* Run x-add-version for omplapp
* Fix versions
* Fix omplapp static builds
* Run x-add-version
* Update ports/omplapp/portfile.cmake
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
* Update ports/omplapp/portfile.cmake
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
* Put files in quotes
* Run x-add-version
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
Diffstat (limited to 'ports/ccd')
| -rw-r--r-- | ports/ccd/CONTROL | 1 | ||||
| -rw-r--r-- | ports/ccd/fix-static.patch | 13 | ||||
| -rw-r--r-- | ports/ccd/portfile.cmake | 8 |
3 files changed, 21 insertions, 1 deletions
diff --git a/ports/ccd/CONTROL b/ports/ccd/CONTROL index 5a5f59e28..6a7d5eeb0 100644 --- a/ports/ccd/CONTROL +++ b/ports/ccd/CONTROL @@ -1,4 +1,5 @@ Source: ccd Version: 2.1-4 +Port-Version: 1 Homepage: https://github.com/danfis/libccd Description: Library for collision detection between two convex shapes diff --git a/ports/ccd/fix-static.patch b/ports/ccd/fix-static.patch new file mode 100644 index 000000000..cfb4d388c --- /dev/null +++ b/ports/ccd/fix-static.patch @@ -0,0 +1,13 @@ +diff --git a/src/ccd/ccd_export.h b/src/ccd/ccd_export.h
+index e898d41..c6aa5fb 100644
+--- a/src/ccd/ccd_export.h
++++ b/src/ccd/ccd_export.h
+@@ -1,7 +1,7 @@
+ #ifndef CCD_EXPORT_H
+ #define CCD_EXPORT_H
+
+-#ifdef CCD_STATIC_DEFINE
++#if 1
+ # define CCD_EXPORT
+ #else
+ # ifdef _MSC_VER
diff --git a/ports/ccd/portfile.cmake b/ports/ccd/portfile.cmake index 29f0f9efa..a465560ca 100644 --- a/ports/ccd/portfile.cmake +++ b/ports/ccd/portfile.cmake @@ -1,3 +1,7 @@ +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(STATIC_PATCH fix-static.patch) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO danfis/libccd @@ -5,7 +9,9 @@ vcpkg_from_github( SHA512 ff037d9c4df50f09600cf9b3514b259b2850ff43f74817853f5665d22812891168f70bd3cc3969b2c9e3c706f6254991a65421476349607fbd04d894b217456d HEAD_REF master # Backport https://github.com/danfis/libccd/pull/70 to support Emscripten - PATCHES "support-emscripten.patch" + PATCHES + "support-emscripten.patch" + ${STATIC_PATCH} ) vcpkg_configure_cmake( |