Changeset 27592


Ignore:
Timestamp:
02/17/23 19:37:37 (2 years ago)
Author:
jdquinn
Message:

CHG: Reverting to GMT 6.0.0 because executables under 6.4.0 do not link statically to libgmt

Location:
issm/trunk-jpl/externalpackages/gmt
Files:
6 edited
1 moved

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/gmt/configs/6.0/static/linux/cmake/ConfigUser.static.cmake

    r27158 r27592  
    191191# Create position independent code on all targets [auto] (needed for static
    192192# build on non-x86):
    193 set (CMAKE_POSITION_INDEPENDENT_CODE TRUE)
     193#set (CMAKE_POSITION_INDEPENDENT_CODE TRUE)
    194194
    195195# Build GMT shared lib with supplemental modules [TRUE]:
    196 set (BUILD_SUPPLEMENTS FALSE)
     196#set (BUILD_SUPPLEMENTS FALSE)
    197197
    198198# Build/Install GMT Developer include files [TRUE]:

  • issm/trunk-jpl/externalpackages/gmt/configs/6.0/static/mac/cmake/ConfigUser.static.cmake

    r27158 r27592  
    191191# Create position independent code on all targets [auto] (needed for static
    192192# build on non-x86):
    193 set (CMAKE_POSITION_INDEPENDENT_CODE TRUE)
     193#set (CMAKE_POSITION_INDEPENDENT_CODE TRUE)
    194194
    195195# Build GMT shared lib with supplemental modules [TRUE]:
    196 set (BUILD_SUPPLEMENTS FALSE)
     196#set (BUILD_SUPPLEMENTS FALSE)
    197197
    198198# Build/Install GMT Developer include files [TRUE]:

  • issm/trunk-jpl/externalpackages/gmt/install-6-linux-static.sh

    r27567 r27592  
    55## Constants
    66#
    7 VER="6.4.0"
     7VER="6.0.0"
    88
    99# Find libgfortran and libgcc so we do not have to hardcode them
    … …  
    4444
    4545# Copy custom configuration files
    46 cp ./configs/6/static/linux/cmake/ConfigUser.static.cmake ./src/cmake/ConfigUser.cmake
    47 cp ./configs/6/static/cmake/modules/FindGDAL.cmake ./src/cmake/modules
    48 cp ./configs/6/static/cmake/modules/FindGSHHG.cmake ./src/cmake/modules
    49 cp ./configs/6/static/cmake/modules/FindNETCDF.cmake ./src/cmake/modules
    50 cp ./configs/6/static/src/CMakeLists.txt ./src/src
     46cp ./configs/6.0/static/linux/cmake/ConfigUser.static.cmake ./src/cmake/ConfigUser.cmake
     47cp ./configs/6.0/static/cmake/modules/FindGDAL.cmake ./src/cmake/modules
     48cp ./configs/6.0/static/cmake/modules/FindGSHHG.cmake ./src/cmake/modules
     49cp ./configs/6.0/static/cmake/modules/FindNETCDF.cmake ./src/cmake/modules
    5150
    5251# Configure

  • issm/trunk-jpl/externalpackages/gmt/install-6-linux.sh

    r27406 r27592  
    55## Constants
    66#
    7 VER="6.4.0"
     7VER="6.0.0"
    88
    99# Find libgfortran so that we do not have to hardcode it.
    … …  
    3636
    3737# Copy custom configuration files
    38 cp ./configs/6/linux/cmake/ConfigUser.cmake ./src/cmake
     38cp ./configs/6.0/linux/cmake/ConfigUser.cmake ./src/cmake
    3939
    4040# Configure

  • issm/trunk-jpl/externalpackages/gmt/install-6-mac-static.sh

    r27567 r27592  
    55## Constants
    66#
    7 VER="6.4.0"
     7VER="6.0.0"
    88
    99# Find libgfortran and libgcc so we do not have to hardcode them
    … …  
    4545
    4646# Copy custom configuration files
    47 cp ./configs/6/static/mac/cmake/ConfigUser.static.cmake ./src/cmake/ConfigUser.cmake
    48 cp ./configs/6/static/cmake/modules/FindGDAL.cmake ./src/cmake/modules
    49 cp ./configs/6/static/cmake/modules/FindGSHHG.cmake ./src/cmake/modules
    50 cp ./configs/6/static/cmake/modules/FindNETCDF.cmake ./src/cmake/modules
     47cp ./configs/6.0/static/mac/cmake/ConfigUser.static.cmake ./src/cmake/ConfigUser.cmake
     48cp ./configs/6.0/static/cmake/modules/FindGDAL.cmake ./src/cmake/modules
     49cp ./configs/6.0/static/cmake/modules/FindGSHHG.cmake ./src/cmake/modules
     50cp ./configs/6.0/static/cmake/modules/FindNETCDF.cmake ./src/cmake/modules
    5151
    5252# Configure

  • issm/trunk-jpl/externalpackages/gmt/install-6-mac.sh

    r27541 r27592  
    55## Constants
    66#
    7 VER="6.4.0"
     7VER="6.0.0"
    88
    99# Find libgfortran so that we do not have to hardcode it.
    … …  
    3636
    3737# Copy custom configuration files
    38 cp ./configs/6/mac/cmake/ConfigUser.cmake ./src/cmake
     38cp ./configs/6.0/mac/cmake/ConfigUser.cmake ./src/cmake
    3939
    4040# Configure
Note: See TracChangeset for help on using the changeset viewer.