From 3126ddca8f3d39e52a3cad0703401cbc24fa8d9f Mon Sep 17 00:00:00 2001 From: xArthur Date: Tue, 7 Dec 2021 11:27:36 +0100 Subject: [PATCH 01/12] add: gmsh --- ports/gmsh/portfile.cmake | 69 +++++++++++++++++++++++++++++++++++++++ ports/gmsh/vcpkg.json | 21 ++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 ports/gmsh/portfile.cmake create mode 100644 ports/gmsh/vcpkg.json diff --git a/ports/gmsh/portfile.cmake b/ports/gmsh/portfile.cmake new file mode 100644 index 00000000000000..f97fb2bf8ab819 --- /dev/null +++ b/ports/gmsh/portfile.cmake @@ -0,0 +1,69 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} +# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# VCPKG_TOOLCHAIN = ON OFF +# TRIPLET_SYSTEM_ARCH = arm x86 x64 +# BUILD_ARCH = "Win32" "x64" "ARM" +# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} +# DEBUG_CONFIG = "Debug Static" "Debug Dll" +# RELEASE_CONFIG = "Release Static"" "Release DLL" +# VCPKG_TARGET_IS_WINDOWS +# VCPKG_TARGET_IS_UWP +# VCPKG_TARGET_IS_LINUX +# VCPKG_TARGET_IS_OSX +# VCPKG_TARGET_IS_FREEBSD +# VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_IS_MINGW +# VCPKG_TARGET_EXECUTABLE_SUFFIX +# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX +# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX +# +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md + +# # Specifies if the port install should fail immediately given a condition +# vcpkg_fail_port_install(MESSAGE "gmsh currently only supports Linux and Mac platforms" ON_TARGET "Windows") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com + OUT_SOURCE_PATH SOURCE_PATH + REPO gmsh/gmsh + REF 4.9.0 + SHA512 a3d820b76e6f0730d1d5aa595bdefcca0cbf3f3b + HEAD_REF gmsh_4_9_0 + [PATCHES ...] + [FILE_DISAMBIGUATOR ] +) + +# # Check if one or more features are a part of a package installation. +# # See /docs/maintainers/vcpkg_check_features.md for more details +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +# FEATURES # <- Keyword FEATURES is required because INVERTED_FEATURES are being used + fltk WITH_FLTK + opencascade OCC OCC_CAF OCC_TBB +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + # PREFER_NINJA # Disable this option if project cannot be built with Ninja + # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 + # OPTIONS_RELEASE -DOPTIMIZE=1 + # OPTIONS_DEBUG -DDEBUGGABLE=1 +) + +vcpkg_install_cmake() + +# # Moves all .cmake files from /debug/share/gmsh/ to /share/gmsh/ +# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details +# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/gmsh) + +# # Handle copyright +# file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gmsh RENAME copyright) diff --git a/ports/gmsh/vcpkg.json b/ports/gmsh/vcpkg.json new file mode 100644 index 00000000000000..c722da25b44387 --- /dev/null +++ b/ports/gmsh/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "gmsh", + "version-string": "4.9.0", + "homepage": "https://gmsh.info", + "description": "Gmsh is an open source 3D finite element mesh generator with a built-in CAD engine and post-processor.", + "dependencies": [], + + "default-features": [], + "features": [ + { + "name": "fltk", + "description": "needed if build with GUI.", + "dependencies": [fltk] + }, + { + "name": "opencascade", + "description": "boolean operations, constructive solid geometry features and STEP file import", + "dependencies": [opencascade] + } + ] +} From f2cb545fd2c99dbb5c21d77229df5927fa63d17d Mon Sep 17 00:00:00 2001 From: xArthur Date: Tue, 7 Dec 2021 13:03:12 +0100 Subject: [PATCH 02/12] add: versioning for gmsh. --- versions/g-/gmsh.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 versions/g-/gmsh.json diff --git a/versions/g-/gmsh.json b/versions/g-/gmsh.json new file mode 100644 index 00000000000000..b3b1b4bc9b0a4b --- /dev/null +++ b/versions/g-/gmsh.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a3d820b76e6f0730d1d5aa595bdefcca0cbf3f3b", + "version-string": "2021-12-04", + "port-version": 0 + } + ] +} From b00064667ea7f49ed586f47662cfceb2278c4126 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 7 Dec 2021 22:35:54 -0800 Subject: [PATCH 03/12] [gmsh] Re-factory code --- ports/gmsh/portfile.cmake | 153 ++++++++++++++++++++++++-------------- ports/gmsh/vcpkg.json | 82 ++++++++++++++------ 2 files changed, 158 insertions(+), 77 deletions(-) diff --git a/ports/gmsh/portfile.cmake b/ports/gmsh/portfile.cmake index f97fb2bf8ab819..cc3518c8e0e46f 100644 --- a/ports/gmsh/portfile.cmake +++ b/ports/gmsh/portfile.cmake @@ -1,69 +1,110 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} -# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# VCPKG_TOOLCHAIN = ON OFF -# TRIPLET_SYSTEM_ARCH = arm x86 x64 -# BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} -# DEBUG_CONFIG = "Debug Static" "Debug Dll" -# RELEASE_CONFIG = "Release Static"" "Release DLL" -# VCPKG_TARGET_IS_WINDOWS -# VCPKG_TARGET_IS_UWP -# VCPKG_TARGET_IS_LINUX -# VCPKG_TARGET_IS_OSX -# VCPKG_TARGET_IS_FREEBSD -# VCPKG_TARGET_IS_ANDROID -# VCPKG_TARGET_IS_MINGW -# VCPKG_TARGET_EXECUTABLE_SUFFIX -# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX -# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX -# -# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md - -# # Specifies if the port install should fail immediately given a condition -# vcpkg_fail_port_install(MESSAGE "gmsh currently only supports Linux and Mac platforms" ON_TARGET "Windows") - vcpkg_from_gitlab( - GITLAB_URL https://gitlab.com + GITLAB_URL https://gitlab.onelab.info/ OUT_SOURCE_PATH SOURCE_PATH REPO gmsh/gmsh - REF 4.9.0 - SHA512 a3d820b76e6f0730d1d5aa595bdefcca0cbf3f3b - HEAD_REF gmsh_4_9_0 - [PATCHES ...] - [FILE_DISAMBIGUATOR ] + REF gmsh_4_9_0 + SHA512 e70a09741a86a9131094e77742078aec1cc94517e1d7c855c257bc93c21c057e25c7ac5168d31ec4d905d78f31d5704faf63bfd3a81b4b9e2ebbcfacf2fdaa8b + HEAD_REF master ) -# # Check if one or more features are a part of a package installation. -# # See /docs/maintainers/vcpkg_check_features.md for more details +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 # <- Keyword FEATURES is required because INVERTED_FEATURES are being used - fltk WITH_FLTK - opencascade OCC OCC_CAF OCC_TBB + FEATURES + fltk ENABLE_FLTK + opencascade ENABLE_OCC + opencascade ENABLE_OCC_CAF + opencascade ENABLE_OCC_TBB + tools ENABLE_BUILD_DYNAMIC + graphics ENABLE_GRAPHICS + mpi ENABLE_MPI + zipper ENABLE_ZIPPER + ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - # PREFER_NINJA # Disable this option if project cannot be built with Ninja - # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 - # OPTIONS_RELEASE -DOPTIMIZE=1 - # OPTIONS_DEBUG -DDEBUGGABLE=1 +if (ENABLE_BUILD_DYNAMIC) + include(vcpkg_find_fortran) + vcpkg_find_fortran(FORTRAN_CMAKE) +endif() + +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 + -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_MESH=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=OFF + -DENABLE_ONELAB_METAMODEL=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_PLUGINS=ON + -DENABLE_POST=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_install_cmake() +vcpkg_cmake_install() -# # Moves all .cmake files from /debug/share/gmsh/ to /share/gmsh/ -# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details # vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/gmsh) -# # Handle copyright -# file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gmsh RENAME copyright) +file(INSTALL" ${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gmsh/vcpkg.json b/ports/gmsh/vcpkg.json index c722da25b44387..f1012340f920dc 100644 --- a/ports/gmsh/vcpkg.json +++ b/ports/gmsh/vcpkg.json @@ -1,21 +1,61 @@ -{ - "name": "gmsh", - "version-string": "4.9.0", - "homepage": "https://gmsh.info", - "description": "Gmsh is an open source 3D finite element mesh generator with a built-in CAD engine and post-processor.", - "dependencies": [], - - "default-features": [], - "features": [ - { - "name": "fltk", - "description": "needed if build with GUI.", - "dependencies": [fltk] - }, - { - "name": "opencascade", - "description": "boolean operations, constructive solid geometry features and STEP file import", - "dependencies": [opencascade] - } - ] -} +{ + "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 + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "fltk": { + "description": "Enable FLTK graphical user interface (requires mesh/post)", + "dependencies": [ + "fltk" + ] + }, + "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" + ] + }, + "tools": { + "description": "Enable dynamic Gmsh executable (linked with shared library)", + "dependencies": [ + "vcpkg-gfortran" + ] + }, + "zipper": { + "description": "Enable Zip file compression/decompression", + "dependencies": [ + "zlib" + ] + } + } +} From 594121509194d85b9cf6bb0467226316ca918e15 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Wed, 8 Dec 2021 01:13:43 -0800 Subject: [PATCH 04/12] Fix install, remove some features due to lack required dependencies. --- ports/gmsh/fix-install.patch | 38 ++++++++++++++++++++++++++++++++++++ ports/gmsh/portfile.cmake | 24 ++++++++++++----------- ports/gmsh/vcpkg.json | 16 --------------- 3 files changed, 51 insertions(+), 27 deletions(-) create mode 100644 ports/gmsh/fix-install.patch diff --git a/ports/gmsh/fix-install.patch b/ports/gmsh/fix-install.patch new file mode 100644 index 00000000000000..2f4510240781de --- /dev/null +++ b/ports/gmsh/fix-install.patch @@ -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) diff --git a/ports/gmsh/portfile.cmake b/ports/gmsh/portfile.cmake index cc3518c8e0e46f..97f1b22cf9cd27 100644 --- a/ports/gmsh/portfile.cmake +++ b/ports/gmsh/portfile.cmake @@ -1,10 +1,11 @@ vcpkg_from_gitlab( - GITLAB_URL https://gitlab.onelab.info/ + 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) @@ -13,15 +14,11 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_RUNTIME) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - fltk ENABLE_FLTK opencascade ENABLE_OCC opencascade ENABLE_OCC_CAF opencascade ENABLE_OCC_TBB - tools ENABLE_BUILD_DYNAMIC - graphics ENABLE_GRAPHICS mpi ENABLE_MPI zipper ENABLE_ZIPPER - ) if (ENABLE_BUILD_DYNAMIC) @@ -39,6 +36,12 @@ vcpkg_cmake_configure( -DENABLE_MSVC_STATIC_RUNTIME=${STATIC_RUNTIME} ${FORTRAN_CMAKE} -DGMSH_RELEASE=ON + -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 @@ -62,7 +65,6 @@ vcpkg_cmake_configure( -DENABLE_KBIPACK=OFF -DENABLE_MATHEX=OFF -DENABLE_MED=OFF - -DENABLE_MESH=OFF -DENABLE_METIS=OFF -DENABLE_MMG=OFF -DENABLE_MPEG_ENCODE=OFF @@ -71,8 +73,8 @@ vcpkg_cmake_configure( -DENABLE_OPENMP=OFF -DENABLE_NUMPY=OFF -DENABLE_PETSC4PY=OFF - -DENABLE_ONELAB=OFF -DENABLE_ONELAB_METAMODEL=OFF + -DENABLE_ONELAB=OFF -DENABLE_OPENACC=OFF -DENABLE_OPTHOM=OFF -DENABLE_OS_SPECIFIC_INSTALL=OFF @@ -81,8 +83,6 @@ vcpkg_cmake_configure( -DENABLE_PACKAGE_STRIP=ON -DENABLE_PARSER=OFF -DENABLE_PETSC=OFF - -DENABLE_PLUGINS=ON - -DENABLE_POST=OFF -DENABLE_POPPLER=OFF -DENABLE_PRIVATE_API=OFF -DENABLE_PRO=OFF @@ -105,6 +105,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/gmsh) +vcpkg_copy_tools(TOOL_NAMES gmsh AUTO_CLEAN) + +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) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gmsh/vcpkg.json b/ports/gmsh/vcpkg.json index f1012340f920dc..56699ebe9cd4d5 100644 --- a/ports/gmsh/vcpkg.json +++ b/ports/gmsh/vcpkg.json @@ -8,19 +8,9 @@ { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ], "features": { - "fltk": { - "description": "Enable FLTK graphical user interface (requires mesh/post)", - "dependencies": [ - "fltk" - ] - }, "graphics": { "description": "Enable building graphics lib even without GUI (advanced)", "dependencies": [ @@ -45,12 +35,6 @@ "tbb" ] }, - "tools": { - "description": "Enable dynamic Gmsh executable (linked with shared library)", - "dependencies": [ - "vcpkg-gfortran" - ] - }, "zipper": { "description": "Enable Zip file compression/decompression", "dependencies": [ From a466eadfe9f495c921e9b7878582760700180717 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Wed, 8 Dec 2021 01:16:23 -0800 Subject: [PATCH 05/12] version --- versions/baseline.json | 4 ++++ versions/g-/gmsh.json | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/versions/baseline.json b/versions/baseline.json index d801294af7f255..a0e3fcbb438f41 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -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 diff --git a/versions/g-/gmsh.json b/versions/g-/gmsh.json index b3b1b4bc9b0a4b..e10a136f47634e 100644 --- a/versions/g-/gmsh.json +++ b/versions/g-/gmsh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "404691b0b25bcbb74d428fdabe7d2e980eb2ef12", + "version": "4.9.0", + "port-version": 0 + }, { "git-tree": "a3d820b76e6f0730d1d5aa595bdefcca0cbf3f3b", "version-string": "2021-12-04", From 44f047d96083c05031c38b91975fd5e13df494ec Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Wed, 8 Dec 2021 01:43:14 -0800 Subject: [PATCH 06/12] Do not support uwp officially --- ports/gmsh/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/gmsh/vcpkg.json b/ports/gmsh/vcpkg.json index 56699ebe9cd4d5..70b1d266ec9cec 100644 --- a/ports/gmsh/vcpkg.json +++ b/ports/gmsh/vcpkg.json @@ -3,6 +3,7 @@ "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", + "supports": "!uwp", "dependencies": [ "blas", { From 6e22d5737866a807dc95527065023b9b7bd04ab3 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Wed, 8 Dec 2021 01:43:21 -0800 Subject: [PATCH 07/12] version --- versions/g-/gmsh.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/gmsh.json b/versions/g-/gmsh.json index e10a136f47634e..f3a192e409fab3 100644 --- a/versions/g-/gmsh.json +++ b/versions/g-/gmsh.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "404691b0b25bcbb74d428fdabe7d2e980eb2ef12", + "git-tree": "fcaff32f2eaf377ea56d5fa50624e909116f10da", "version": "4.9.0", "port-version": 0 }, From 1bf2aec886855c3ac4fb035478de5c5332f7109d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 10 Dec 2021 10:44:35 +0800 Subject: [PATCH 08/12] Update ports/gmsh/portfile.cmake --- ports/gmsh/portfile.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ports/gmsh/portfile.cmake b/ports/gmsh/portfile.cmake index 97f1b22cf9cd27..595942103acbbb 100644 --- a/ports/gmsh/portfile.cmake +++ b/ports/gmsh/portfile.cmake @@ -21,10 +21,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS zipper ENABLE_ZIPPER ) -if (ENABLE_BUILD_DYNAMIC) - include(vcpkg_find_fortran) - vcpkg_find_fortran(FORTRAN_CMAKE) -endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" From ad8d17f4708865fdd1a934e8c1981c9dc236329c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 10 Dec 2021 10:51:50 +0800 Subject: [PATCH 09/12] Update versions/g-/gmsh.json --- versions/g-/gmsh.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/versions/g-/gmsh.json b/versions/g-/gmsh.json index f3a192e409fab3..ae34ec23ab1ec3 100644 --- a/versions/g-/gmsh.json +++ b/versions/g-/gmsh.json @@ -1,14 +1,9 @@ { "versions": [ { - "git-tree": "fcaff32f2eaf377ea56d5fa50624e909116f10da", + "git-tree": "992d5523675b2e8483db92e258b17ad357349085", "version": "4.9.0", "port-version": 0 - }, - { - "git-tree": "a3d820b76e6f0730d1d5aa595bdefcca0cbf3f3b", - "version-string": "2021-12-04", - "port-version": 0 } ] } From 78417225e45d5df7d3a8cf5e79c085318c09c462 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 16 Dec 2021 22:56:14 -0800 Subject: [PATCH 10/12] Group the options --- ports/gmsh/portfile.cmake | 62 +++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/ports/gmsh/portfile.cmake b/ports/gmsh/portfile.cmake index 97f1b22cf9cd27..a57ad4d7fe97d0 100644 --- a/ports/gmsh/portfile.cmake +++ b/ports/gmsh/portfile.cmake @@ -36,31 +36,43 @@ vcpkg_cmake_configure( -DENABLE_MSVC_STATIC_RUNTIME=${STATIC_RUNTIME} ${FORTRAN_CMAKE} -DGMSH_RELEASE=ON - -DENABLE_BUILD_DYNAMIC=OFF - -DENABLE_FLTK=OFF - -DENABLE_GRAPHICS=OFF + -DENABLE_PACKAGE_STRIP=ON + -DENABLE_SYSTEM_CONTRIB=ON + # Not implement + -DENABLE_GRAPHICS=OFF # Requires mesh, post, plugins and onelab -DENABLE_POST=OFF -DENABLE_PLUGINS=OFF -DENABLE_MESH=OFF + -DENABLE_PARSER=OFF + -DENABLE_PROFILE=OFF + -DENABLE_PRIVATE_API=OFF + -DENABLE_QUADMESHINGTOOLS=OFF + -DENABLE_PRO=OFF + -DENABLE_TOUCHBAR=OFF + -DENABLE_VISUDEV=OFF + -DENABLE_BLAS_LAPACK=OFF + -DENABLE_CAIRO=OFF + -DENABLE_CGNS=OFF + -DENABLE_CGNS_CPEX0045=OFF + -DENABLE_EIGEN=OFF + -DENABLE_GMP=OFF + -DENABLE_OPENMP=OFF + -DENABLE_POPPLER=OFF + -DENABLE_WRAP_JAVA=OFF + -DENABLE_WRAP_PYTHON=OFF + # Requies dependencies which not included in vcpkg yet -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_BUILD_DYNAMIC=OFF # Needs gfortran + -DENABLE_FLTK=OFF # Needs executable fltk-config -DENABLE_DINTEGRATION=OFF - -DENABLE_DOMHEX=OFF - -DENABLE_EIGEN=OFF -DENABLE_GEOMETRYCENTRAL=OFF + -DENABLE_DOMHEX=OFF -DENABLE_GETDP=OFF -DENABLE_GMM=OFF - -DENABLE_GMP=OFF -DENABLE_HXT=OFF -DENABLE_KBIPACK=OFF -DENABLE_MATHEX=OFF @@ -69,38 +81,30 @@ vcpkg_cmake_configure( -DENABLE_MMG=OFF -DENABLE_MPEG_ENCODE=OFF -DENABLE_MUMPS=OFF - -DENABLE_NETGEN=OFF - -DENABLE_OPENMP=OFF -DENABLE_NUMPY=OFF + -DENABLE_NETGEN=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 + # experimental + -DENABLE_BUILD_ANDROID=OFF + -DENABLE_BUILD_IOS=OFF + + -DENABLE_OS_SPECIFIC_INSTALL=OFF # Needs system permission + -DENABLE_RPATH=OFF # Should use dependencies in vcpkg + -DENABLE_TESTS=OFF ) vcpkg_cmake_install() From a330c25998c41254d2650be7a9cea5ee9268897e Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 16 Dec 2021 22:56:31 -0800 Subject: [PATCH 11/12] version --- versions/g-/gmsh.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/gmsh.json b/versions/g-/gmsh.json index f3a192e409fab3..5c2061a4bef921 100644 --- a/versions/g-/gmsh.json +++ b/versions/g-/gmsh.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fcaff32f2eaf377ea56d5fa50624e909116f10da", + "git-tree": "3daa7b3643adda00740209418271f205c05dcc9a", "version": "4.9.0", "port-version": 0 }, From acf148a5c098ed607b56fd9fb725f3f2d75e535e Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 16 Dec 2021 22:58:26 -0800 Subject: [PATCH 12/12] version --- versions/g-/gmsh.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/gmsh.json b/versions/g-/gmsh.json index 2cd61005b034ab..1b357c663e8528 100644 --- a/versions/g-/gmsh.json +++ b/versions/g-/gmsh.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3daa7b3643adda00740209418271f205c05dcc9a", + "git-tree": "d01377e2003c3ea5ef7a6b9fb215a086e5f75eed", "version": "4.9.0", "port-version": 0 }