Changeset 27636


Ignore:
Timestamp:
03/08/23 12:08:11 (2 years ago)
Author:
jdquinn
Message:

CHG: Static linking to libgmp from Gmsh

Location:
issm/trunk-jpl
Files:
9 edited
1 copied
2 moved

Legend:

Unmodified
Added
Removed

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

    r27406 r27636  
    1 --- src/CMakeLists.txt  2022-07-01 00:37:10
    2 +++ /Users/jdq/Downloads/CMakeLists.txt 2022-11-21 11:51:13
    3 @@ -792,7 +792,7 @@
    4    add_subdirectory(contrib/kbipack)
    5    include_directories(contrib/kbipack)
    6    if(ENABLE_GMP)
    7 -    find_library(GMP_LIB gmp)
    8 +    find_library(GMP_LIB libgmp.a)
    9      find_path(GMP_INC "gmp.h" PATH_SUFFIXES src include)
    10    endif()
    11    if(GMP_LIB AND GMP_INC)
    12 @@ -855,10 +855,9 @@
    13  
    14  if(HAVE_MESH OR HAVE_SOLVER)
    15    if(ENABLE_METIS)
    16 -    find_library(METIS_LIB metis PATH_SUFFIXES lib)
    17 -    find_path(METIS_INC "metis.h" PATH_SUFFIXES include)
    18 -    if(ENABLE_SYSTEM_CONTRIB AND METIS_LIB AND METIS_INC)
    19 -      message(STATUS "Using system version of METIS")
    20 +    if(METIS_ROOT)
    21 +      find_library(METIS_LIB metis PATHS ${METIS_ROOT} PATH_SUFFIXES lib)
    22 +      find_path(METIS_INC "metis.h" PATHS ${METIS_ROOT} PATH_SUFFIXES include)
    23        list(APPEND EXTERNAL_LIBRARIES ${METIS_LIB})
    24        list(APPEND EXTERNAL_INCLUDES ${METIS_INC})
    25        set_config_option(HAVE_METIS "Metis")
     1207a208
     2>   set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".so")
     3226a228
     4>   set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".so")
     5858,861c860,862
     6<     find_library(METIS_LIB metis PATH_SUFFIXES lib)
     7<     find_path(METIS_INC "metis.h" PATH_SUFFIXES include)
     8<     if(ENABLE_SYSTEM_CONTRIB AND METIS_LIB AND METIS_INC)
     9<       message(STATUS "Using system version of METIS")
     10---
     11>     if(METIS_ROOT)
     12>       find_library(METIS_LIB metis PATHS ${METIS_ROOT} PATH_SUFFIXES lib)
     13>       find_path(METIS_INC "metis.h" PATHS ${METIS_ROOT} PATH_SUFFIXES include)

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

    r27561 r27636  
    4343rm -rf gmsh-${VER}-source
    4444
     45# Apply patches
     46patch src/CMakeLists.txt < configs/${VER}/static/CMakeLists.txt.patch
     47
    4548# Configure
    4649#

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

    r27603 r27636  
    1717VER="4.10.5"
    1818
    19 PREFIX="${ISSM_DIR}/externalpackages/gmsh/install" # Set to location where external package should be installed
     19PREFIX="${ISSM_EXT_DIR}/static/gmsh/install" # Set to location where external package should be installed
    2020
    2121
    … …  
    4747
    4848# Apply patches
    49 #patch src/CMakeLists.txt < configs/${VER}/static/CMakeLists.txt.patch
     49patch src/CMakeLists.txt < configs/${VER}/static/CMakeLists.txt.patch
    5050
    5151# Configure

  • issm/trunk-jpl/jenkins/mac-intel-binaries-matlab

    r27566 r27636  
    5555        gdal            install-3-static.sh
    5656        gshhg           install.sh
    57         gmt                     install-6-mac-static.sh
     57        gmt                     install-6-mac-intel-static.sh
    5858        gmsh            install-4-mac-static.sh
    5959        triangle        install-mac-static.sh

  • issm/trunk-jpl/jenkins/mac-intel-binaries-python-3

    r27611 r27636  
    5555        gdal            install-3-python-static.sh
    5656        gshhg           install.sh
    57         gmt                     install-6-mac-static.sh
     57        gmt                     install-6-mac-intel-static.sh
    5858        gmsh            install-4-mac-static.sh
    5959        triangle        install-mac-static.sh

  • issm/trunk-jpl/jenkins/mac-intel-dakota

    r27611 r27636  
    5555        gdal            install-3-python.sh
    5656        gshhg           install.sh
    57         gmt                     install-6-mac.sh
     57        gmt                     install-6-mac-intel.sh
    5858        gmsh            install-4-mac.sh
    5959        triangle        install-mac.sh

  • issm/trunk-jpl/jenkins/mac-intel-examples

    r27611 r27636  
    5656        gdal            install-3-python.sh
    5757        gshhg           install.sh
    58         gmt                     install-6-mac.sh
     58        gmt                     install-6-mac-intel.sh
    5959        gmsh            install-4-mac.sh
    6060        triangle        install-mac.sh

  • issm/trunk-jpl/jenkins/mac-intel-solid_earth

    r27611 r27636  
    5555        gdal            install-3-python.sh
    5656        gshhg           install.sh
    57         gmt                     install-6-mac.sh
     57        gmt                     install-6-mac-intel.sh
    5858        gmsh            install-4-mac.sh
    5959        triangle        install-mac.sh

  • issm/trunk-jpl/jenkins/mac-silicon-basic

    r27567 r27636  
    2121        --with-numthreads=8 \
    2222        --with-matlab-dir=${MATLAB_PATH} \
    23         --with-fortran-lib="-L/opt/homebrew/Cellar/gcc/12.2.0/lib/gcc/12 -lgfortran" \
     23        --with-fortran-lib="-L/opt/homebrew/lib/gcc/current -lgfortran" \
    2424        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
    2525        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
Note: See TracChangeset for help on using the changeset viewer.