Skip to content
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

[gmsh] Add new port #21896

Merged
merged 13 commits into from
Dec 17, 2021
Merged

[gmsh] Add new port #21896

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3126ddc
add: gmsh
xarthurx Dec 7, 2021
f2cb545
add: versioning for gmsh.
xarthurx Dec 7, 2021
b000646
[gmsh] Re-factory code
Dec 8, 2021
5941215
Fix install, remove some features due to lack required dependencies.
Dec 8, 2021
a466ead
version
Dec 8, 2021
44f047d
Do not support uwp officially
Dec 8, 2021
6e22d57
version
Dec 8, 2021
1bf2aec
Update ports/gmsh/portfile.cmake
JackBoosY Dec 10, 2021
ad8d17f
Update versions/g-/gmsh.json
JackBoosY Dec 10, 2021
7841722
Group the options
Dec 17, 2021
a330c25
version
Dec 17, 2021
0647c13
Merge branch 'master' of https://github.com/xarthurx/vcpkg
Dec 17, 2021
acf148a
version
Dec 17, 2021
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
38 changes: 38 additions & 0 deletions ports/gmsh/fix-install.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7040709..a4b8c61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1872,12 +1872,30 @@ 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")
-install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
+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
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ OPTIONAL
+ )
endif()
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
- install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL)
+ install(
+ TARGETS shared
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ OPTIONAL
+ )
endif()

if(ENABLE_ONELAB AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab)
112 changes: 112 additions & 0 deletions ports/gmsh/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
vcpkg_from_gitlab(
GITLAB_URL https://gitlab.onelab.info
OUT_SOURCE_PATH SOURCE_PATH
REPO gmsh/gmsh
REF gmsh_4_9_0
SHA512 e70a09741a86a9131094e77742078aec1cc94517e1d7c855c257bc93c21c057e25c7ac5168d31ec4d905d78f31d5704faf63bfd3a81b4b9e2ebbcfacf2fdaa8b
HEAD_REF master
PATCHES fix-install.patch
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_LIB)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_RUNTIME)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
opencascade ENABLE_OCC
opencascade ENABLE_OCC_CAF
opencascade ENABLE_OCC_TBB
mpi ENABLE_MPI
zipper ENABLE_ZIPPER
)

if (ENABLE_BUILD_DYNAMIC)
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved
include(vcpkg_find_fortran)
vcpkg_find_fortran(FORTRAN_CMAKE)
endif()
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE
OPTIONS
${FEATURE_OPTIONS}
-DENABLE_BUILD_LIB=${BUILD_LIB}
-DENABLE_BUILD_SHARED=${BUILD_SHARED}
-DENABLE_MSVC_STATIC_RUNTIME=${STATIC_RUNTIME}
${FORTRAN_CMAKE}
-DGMSH_RELEASE=ON
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there some kind of rationale as to which of these are turned on vs. off? I don't really know how to evaluate if this is correct or not but I see yet another scientific compute project that depends on the universe of optional dependencies and am scared 👻

Also, is there a good way to make sure if/when the version is updated that we know what the new optional dependencies are to turn off?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to the CMakeLists.txt:

if(NOT GMSH_RELEASE)
  find_package(Git)
  if(GIT_FOUND)
    execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ERROR_QUIET
                    OUTPUT_VARIABLE GIT_COMMIT_HASH
                    OUTPUT_STRIP_TRAILING_WHITESPACE)
  endif()
  if(GIT_COMMIT_HASH)
    set(GMSH_EXTRA_VERSION "${GMSH_EXTRA_VERSION}-git-${GIT_COMMIT_HASH}")
  endif()
  set(GMSH_EXTRA_VERSION_TEXI "${GMSH_EXTRA_VERSION_TEXI} (development version)")
endif()

set(GMSH_SHORT_VERSION
    "${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}")
set(GMSH_VERSION "${GMSH_SHORT_VERSION}${GMSH_EXTRA_VERSION}")
set(GMSH_SHORT_LICENSE "GNU General Public License")

set(GMSH_GITLAB_PREFIX "https://gitlab.onelab.info/gmsh/gmsh")
if(GMSH_RELEASE)
  string(REPLACE "\." "_" GMSH_SHORT_VERSION_ ${GMSH_SHORT_VERSION})
  set(GMSH_GITLAB_PREFIX "${GMSH_GITLAB_PREFIX}/blob/gmsh_${GMSH_SHORT_VERSION_}")
else()
  set(GMSH_GITLAB_PREFIX "${GMSH_GITLAB_PREFIX}/blob/master")
endif()

This option is used to get gmsh version.
Since we use the release, so it should be turn on.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JackBoosY Perhaps I chose a bad example option. There are a ton of options in this list that look like they control optional dependencies, and I don't know how to evaluate how or why various ones of those are turned on. (Of course the first option in the list is the one that just tells it it's a release copy :()

-DENABLE_BUILD_DYNAMIC=OFF
-DENABLE_FLTK=OFF
-DENABLE_GRAPHICS=OFF
-DENABLE_POST=OFF
-DENABLE_PLUGINS=OFF
-DENABLE_MESH=OFF
-DENABLE_3M=OFF
-DENABLE_ALGLIB=OFF
-DENABLE_ANN=OFF
-DENABLE_BAMG=OFF
-DENABLE_BLAS_LAPACK=OFF
-DENABLE_BLOSSOM=OFF
-DENABLE_BUILD_ANDROID=OFF
-DENABLE_BUILD_IOS=OFF
-DENABLE_CGNS=OFF
-DENABLE_CGNS_CPEX0045=OFF
-DENABLE_CAIRO=OFF
-DENABLE_PROFILE=OFF
-DENABLE_DINTEGRATION=OFF
-DENABLE_DOMHEX=OFF
-DENABLE_EIGEN=OFF
-DENABLE_GEOMETRYCENTRAL=OFF
-DENABLE_GETDP=OFF
-DENABLE_GMM=OFF
-DENABLE_GMP=OFF
-DENABLE_HXT=OFF
-DENABLE_KBIPACK=OFF
-DENABLE_MATHEX=OFF
-DENABLE_MED=OFF
-DENABLE_METIS=OFF
-DENABLE_MMG=OFF
-DENABLE_MPEG_ENCODE=OFF
-DENABLE_MUMPS=OFF
-DENABLE_NETGEN=OFF
-DENABLE_OPENMP=OFF
-DENABLE_NUMPY=OFF
-DENABLE_PETSC4PY=OFF
-DENABLE_ONELAB_METAMODEL=OFF
-DENABLE_ONELAB=OFF
-DENABLE_OPENACC=OFF
-DENABLE_OPTHOM=OFF
-DENABLE_OS_SPECIFIC_INSTALL=OFF
-DENABLE_OSMESA=OFF
-DENABLE_P4EST=OFF
-DENABLE_PACKAGE_STRIP=ON
-DENABLE_PARSER=OFF
-DENABLE_PETSC=OFF
-DENABLE_POPPLER=OFF
-DENABLE_PRIVATE_API=OFF
-DENABLE_PRO=OFF
-DENABLE_QUADMESHINGTOOLS=OFF
-DENABLE_QUADTRI=OFF
-DENABLE_REVOROPT=OFF
-DENABLE_RPATH=OFF # Should use dependencies in vcpkg
-DENABLE_SLEPC=OFF
-DENABLE_SOLVER=OFF
-DENABLE_SYSTEM_CONTRIB=ON
-DENABLE_TCMALLOC=OFF
-DENABLE_TESTS=OFF
-DENABLE_TOUCHBAR=OFF
-DENABLE_VISUDEV=OFF
-DENABLE_VOROPP=OFF
-DENABLE_WINSLOWUNTANGLER=OFF
-DENABLE_WRAP_JAVA=OFF
-DENABLE_WRAP_PYTHON=OFF
)

vcpkg_cmake_install()

vcpkg_copy_tools(TOOL_NAMES gmsh AUTO_CLEAN)
BillyONeal marked this conversation as resolved.
Show resolved Hide resolved

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")

file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
45 changes: 45 additions & 0 deletions ports/gmsh/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"name": "gmsh",
"version": "4.9.0",
"description": "Gmsh is an open source 3D finite element mesh generator with a built-in CAD engine and post-processor.",
"homepage": "https://gmsh.info",
"dependencies": [
"blas",
{
"name": "vcpkg-cmake",
"host": true
}
],
"features": {
"graphics": {
"description": "Enable building graphics lib even without GUI (advanced)",
"dependencies": [
"libjpeg-turbo",
"libpng",
"opengl",
"zlib"
]
},
"mpi": {
"description": "Enable MPI (experimental, not used for meshing)",
"dependencies": [
"openmpi"
]
},
"occ": {
"description": "Enable OpenCASCADE modules",
"dependencies": [
"caf",
"freetype",
"opencascade",
"tbb"
]
},
"zipper": {
"description": "Enable Zip file compression/decompression",
"dependencies": [
"zlib"
]
}
}
}
4 changes: 4 additions & 0 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2516,6 +2516,10 @@
"baseline": "6.2.1",
"port-version": 7
},
"gmsh": {
"baseline": "4.9.0",
"port-version": 0
},
"google-cloud-cpp": {
"baseline": "1.34.0",
"port-version": 0
Expand Down
14 changes: 14 additions & 0 deletions versions/g-/gmsh.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"versions": [
{
"git-tree": "404691b0b25bcbb74d428fdabe7d2e980eb2ef12",
"version": "4.9.0",
"port-version": 0
},
{
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved
"git-tree": "a3d820b76e6f0730d1d5aa595bdefcca0cbf3f3b",
"version-string": "2021-12-04",
"port-version": 0
}
]
}