[gmsh] Export unofficial config files (#40835)

This commit is contained in:
MonicaLiu 2024-09-09 20:24:18 -07:00 committed by GitHub
parent 52fa4fb378
commit aebddbb85e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 27 additions and 7 deletions

View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7040709..a4b8c61 100644
index 2e65c4f..50bea50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1872,12 +1872,30 @@ endif()
@@ -1947,13 +1947,37 @@ endif()
# mark targets as optional so we can install them separately if needed
# (e.g. "make lib" or "make shared" followed by "make install/fast")
@ -10,29 +10,37 @@ index 7040709..a4b8c61 100644
+install(
+ TARGETS gmsh
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ OPTIONAL
+)
if(ENABLE_BUILD_LIB)
- install(TARGETS lib DESTINATION ${GMSH_LIB} OPTIONAL)
+ install(
+ TARGETS lib
+ RUNTIME DESTINATION bin
+ EXPORT unofficial-gmsh-config
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ OPTIONAL
+ )
+ TARGET_INCLUDE_DIRECTORIES(lib PUBLIC $<INSTALL_INTERFACE:include>)
endif()
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
- install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL)
-endif()
+ install(
+ TARGETS shared
+ EXPORT unofficial-gmsh-config
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ OPTIONAL
+ )
endif()
+ TARGET_INCLUDE_DIRECTORIES(shared PUBLIC $<INSTALL_INTERFACE:include>)
+endif()
+install(
+ EXPORT unofficial-gmsh-config
+ NAMESPACE unofficial::gmsh::
+ DESTINATION share/unofficial-gmsh
+)
if(ENABLE_ONELAB AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab)
install(FILES ${ONELAB_PY} DESTINATION ${GMSH_BIN})

View File

@ -108,6 +108,8 @@ vcpkg_cmake_install()
vcpkg_copy_tools(TOOL_NAMES gmsh AUTO_CLEAN)
vcpkg_cmake_config_fixup(PACKAGE_NAME "unofficial-gmsh")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")

View File

@ -1,6 +1,7 @@
{
"name": "gmsh",
"version": "4.12.2",
"port-version": 1,
"description": "Gmsh is an open source 3D finite element mesh generator with a built-in CAD engine and post-processor.",
"homepage": "https://gmsh.info",
"license": "LGPL-2.0-or-later",
@ -10,6 +11,10 @@
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"features": {

View File

@ -3166,7 +3166,7 @@
},
"gmsh": {
"baseline": "4.12.2",
"port-version": 0
"port-version": 1
},
"gobject-introspection": {
"baseline": "1.72.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b32cf3fd3185169073c2aa58a2758fa7fe153808",
"version": "4.12.2",
"port-version": 1
},
{
"git-tree": "d97f6df221dfe46e532d3f9d27c4dbd3bbdac0ea",
"version": "4.12.2",