Changeset 27642

Timestamp:

Mar 9, 2023, 9:46:16 PM (4 years ago)

Author:

jdquinn

Message:

BUG: Separate patches for Mac and Linux

Location:

issm/trunk-jpl/externalpackages/gmsh

Files:

• configs/4.10.5/static/CMakeLists.txt.patch (copied) (copied from issm/trunk-jpl/externalpackages/gmsh/configs/4.10.5/static/CMakeLists.txt.patch ) (1 diff)
• configs/4.10.5/static/mac (added)
• configs/4.10.5/static/mac/CMakeLists.txt.patch (copied) (copied from issm/trunk-jpl/externalpackages/gmsh/configs/4.10.5/static/CMakeLists.txt.patch ) (1 diff)
• install-4-mac-static.sh (modified) (1 diff)

issm/trunk-jpl/externalpackages/gmsh/configs/4.10.5/static/CMakeLists.txt.patch

@@ -1 @@
-207a208
->   set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".so")
-226a228
->   set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".so")
 858,861c860,862
 <     find_library(METIS_LIB metis PATH_SUFFIXES lib)

issm/trunk-jpl/externalpackages/gmsh/configs/4.10.5/static/mac/CMakeLists.txt.patch

@@ -3 +3 @@
 226a228
 >   set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".so")
-858,861c860,862
-<     find_library(METIS_LIB metis PATH_SUFFIXES lib)
-<     find_path(METIS_INC "metis.h" PATH_SUFFIXES include)
-<     if(ENABLE_SYSTEM_CONTRIB AND METIS_LIB AND METIS_INC)
-<       message(STATUS "Using system version of METIS")
----
->     if(METIS_ROOT)
->       find_library(METIS_LIB metis PATHS ${METIS_ROOT} PATH_SUFFIXES lib)
->       find_path(METIS_INC "metis.h" PATHS ${METIS_ROOT} PATH_SUFFIXES include)

issm/trunk-jpl/externalpackages/gmsh/install-4-mac-static.sh

@@ -47 +47 @@
 # Apply patches
 patch src/CMakeLists.txt < configs/${VER}/static/CMakeLists.txt.patch
+patch src/CMakeLists.txt < configs/${VER}/static/mac/CMakeLists.txt.patch
 
 # Configure