Changeset 27944


Ignore:
Timestamp:
10/06/23 17:15:51 (18 months ago)
Author:
jdquinn
Message:

CHG: Support for MATLAB binaries on Windows

Location:
issm/trunk-jpl
Files:
6 added
13 edited
1 copied

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/msmpi/install.sh

    r26039 r27944  
    3434PREFIX="${ISSM_DIR}/externalpackages/msmpi/install"
    3535
     36MSMPI_BIN_DIR=$(cygpath -u $(cygpath -ms "/c/Program Files/Microsoft MPI/Bin"))
     37MSMPI_INC_DIR=$(cygpath -u $(cygpath -ms "/c/Program Files (x86)/Microsoft SDKs/MPI/Include"))
    3638MSMPI_LIB="/c/Windows/System32/msmpi.dll"
    37 MSMPI_INC=$(cygpath -u $(cygpath -ms "/c/Program Files (x86)/Microsoft SDKs/MPI/Include"))
    3839
    3940# Cleanup
    4041rm -rf ${PREFIX}
    41 mkdir -p ${PREFIX} ${PREFIX}/include ${PREFIX}/lib
     42mkdir -p ${PREFIX} ${PREFIX}/bin ${PREFIX}/include ${PREFIX}/lib
    4243
    4344# Copy MS-MPI header files to 'include' directory
    44 cp ${MSMPI_INC}/mpi.h ${PREFIX}/include
    45 cp ${MSMPI_INC}/mpi.f90 ${PREFIX}/include
    46 cp ${MSMPI_INC}/mpif.h ${PREFIX}/include
    47 cp ${MSMPI_INC}/mpio.h ${PREFIX}/include
    48 cp ${MSMPI_INC}/x64/mpifptr.h ${PREFIX}/include
     45cp ${MSMPI_INC_DIR}/mpi.h ${PREFIX}/include
     46cp ${MSMPI_INC_DIR}/mpi.f90 ${PREFIX}/include
     47cp ${MSMPI_INC_DIR}/mpif.h ${PREFIX}/include
     48cp ${MSMPI_INC_DIR}/mpio.h ${PREFIX}/include
     49cp ${MSMPI_INC_DIR}/x64/mpifptr.h ${PREFIX}/include
    4950
    5051# Copy MS-MPI library to 'lib' directory

  • issm/trunk-jpl/externalpackages/petsc/install-3.14-win-msys2-mingw-msmpi-static.sh

    r27900 r27944  
    2121
    2222MAKEFILE_GENERATOR='-G "MSYS Makefiles"'
     23PETSC_ARCH="arch-mswin-c-opt"
    2324PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" # DO NOT CHANGE THIS
    2425PREFIX="${ISSM_DIR}/externalpackages/petsc/install" # Set to location where external package should be installed
    … …  
    3839rm -rf petsc-${VER}
    3940
    40 # Copy customized source files to $PETSC_DIR
    41 cp configs/3.14/win/msys2/mingw64/config/configure.py ${PETSC_DIR}/config
     41# Patch source
     42sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/python3|' ${PETSC_DIR}/config/configure.py
     43sed -i 's|  chkusingwindowspython()|#  chkusingwindowspython()|' ${PETSC_DIR}/config/configure.py
     44sed -i 's|(MAKEFLAGS)|(MAKEFLAGS:w=)|' ${PETSC_DIR}/makefile ${PETSC_DIR}/lib/petsc/conf/rules # Fix for issue with GNUMake 4.4.1 (https://gitlab.com/petsc/petsc/-/merge_requests/6140)
    4245
    4346# Configure
    … …  
    5962        --prefix="${PREFIX}" \
    6063        --PETSC_DIR="${PETSC_DIR}" \
    61         --CFLAGS="-fPIC -Wno-error=implicit-function-declaration" \
    62         --CXXFLAGS="-fPIC" \
    63         --FFLAGS="-fPIC -fallow-argument-mismatch -fallow-invalid-boz" \
     64        --PETSC_ARCH="${PETSC_ARCH}" \
     65        --CFLAGS="-fPIC -Wl,-static -Wno-error=implicit-function-declaration" \
     66        --CXXFLAGS="-fPIC -Wl,-static" \
     67        --FFLAGS="-fPIC -Wl,-static -fallow-argument-mismatch -fallow-invalid-boz" \
    6468        --with-shared-libraries=0 \
    6569        --with-debugging=0 \
    … …  
    6973        --with-proc-filesystem=0 \
    7074        --with-mpiexec="${MPIEXEC_DIR}/mpiexec.exe" \
    71         --with-mpi-lib="-L${MSMPI_ROOT}/lib -lmsmpi" \
    72         --with-mpi-include="${MSMPI_ROOT}/include" \
     75        --with-mpi-lib=["-L${MSMPI_ROOT}/lib","-lmsmpi"] \
     76        --with-mpi-include=["${MSMPI_ROOT}/include"] \
    7377        --download-fblaslapack=1 \
    7478        --download-metis=1 \
    … …  
    8185
    8286# Compile and install
    83 make
    84 make install
     87make PETSC_DIR="${PETSC_DIR}" PETSC_ARCH="${PETSC_ARCH}" all
     88make PETSC_DIR="${PETSC_DIR}" PETSC_ARCH="${PETSC_ARCH}" install

  • issm/trunk-jpl/externalpackages/petsc/install-3.14-win-msys2-mingw-msmpi.sh

    r27202 r27944  
    2121
    2222MAKEFILE_GENERATOR='-G "MSYS Makefiles"'
     23PETSC_ARCH="arch-mswin-c-opt"
    2324PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" # DO NOT CHANGE THIS
    2425PREFIX="${ISSM_DIR}/externalpackages/petsc/install" # Set to location where external package should be installed
    … …  
    3839rm -rf petsc-${VER}
    3940
    40 # Copy customized source files to $PETSC_DIR
    41 cp configs/3.14/win/msys2/mingw64/config/configure.py ${PETSC_DIR}/config
     41# Patch source
     42sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/python3|' ${PETSC_DIR}/config/configure.py
     43sed -i 's|  chkusingwindowspython()|#  chkusingwindowspython()|' ${PETSC_DIR}/config/configure.py
     44sed -i 's|(MAKEFLAGS)|(MAKEFLAGS:w=)|' ${PETSC_DIR}/makefile ${PETSC_DIR}/lib/petsc/conf/rules # Fix for issue with GNUMake 4.4.1 (https://gitlab.com/petsc/petsc/-/merge_requests/6140)
    4245
    4346# Configure
    … …  
    6972        --with-proc-filesystem=0 \
    7073        --with-mpiexec="${MPIEXEC_DIR}/mpiexec.exe" \
    71         --with-mpi-lib="-L${MSMPI_ROOT}/lib -lmsmpi" \
    72         --with-mpi-include="${MSMPI_ROOT}/include" \
     74        --with-mpi-lib=["-L${MSMPI_ROOT}/lib","-lmsmpi"] \
     75        --with-mpi-include=["${MSMPI_ROOT}/include"] \
    7376        --download-fblaslapack=1 \
    7477        --download-metis=1 \
    … …  
    8184
    8285# Compile and install
    83 make
    84 make install
     86make PETSC_DIR="${PETSC_DIR}" PETSC_ARCH="${PETSC_ARCH}" all
     87make PETSC_DIR="${PETSC_DIR}" PETSC_ARCH="${PETSC_ARCH}" install

  • issm/trunk-jpl/m4/issm_options.m4

    r27921 r27944  
    543543                                        TRIANGLELIB=${TRIANGLE_ROOT}/share/triangle.o
    544544                                else
    545                                         TRIANGLELIB="-L${TRIANGLE_ROOT}/lib -ltriangle"
     545                                        TRIANGLELIB="-Wl,-L${TRIANGLE_ROOT}/lib -Wl,-ltriangle"
    546546                                fi
    547547                        ;;
    … …  
    14181418                        ;;
    14191419                        *mingw*)
    1420                                 PETSCLIB="-Wl,${PETSC_ROOT}/lib/libpetsc.a"
     1420                                PETSCLIB="-Wl,-L${PETSC_ROOT}/lib -Wl,-lpetsc"
    14211421                        ;;
    14221422                        *msys*)
    … …  
    14741474                        MPILIB="${MPI_LIBFLAGS}"
    14751475                else
    1476                         MPILIB="-L${MPI_LIBDIR} ${MPI_LIBFLAGS}"
     1476                        MPILIB="${MPI_LIBDIR} ${MPI_LIBFLAGS}"
    14771477                fi
    14781478
    … …  
    15681568                                ;;
    15691569                                *mingw*)
    1570                                         METISLIB="-Wl,${METIS_ROOT}/lib/libmetis.a"
     1570                                        METISLIB="-Wl,-L${METIS_ROOT}/lib -Wl,-lmetis"
    15711571                                ;;
    15721572                                *msys*)
    … …  
    15871587                                ;;
    15881588                                *mingw*)
    1589                                         METISLIB="-Wl,${METIS_ROOT}/lib/libmetis.a"
     1589                                        METISLIB="-Wl,-L${METIS_ROOT}/lib -Wl,-lmetis"
    15901590                                ;;
    15911591                                *msys*)
    … …  
    16441644                                ;;
    16451645                                *mingw*)
    1646                                         PARMETISLIB="-Wl,${PARMETIS_ROOT}/lib/libparmetis.a"
     1646                                        PARMETISLIB="-Wl,-L${PARMETIS_ROOT}/lib -Wl,-lparmetis"
    16471647                                ;;
    16481648                        esac
    … …  
    17131713        if test "x${HAVE_M1QN3}" == "xyes"; then
    17141714                if test "${IS_MSYS2}" == "yes"; then
    1715                         M1QN3LIB="-Wl,${M1QN3_ROOT}/libm1qn3.a -Wl,${M1QN3_ROOT}/libddot.a"
     1715                        M1QN3LIB="-Wl,-L${M1QN3_ROOT} -Wl,-lm1qn3 -Wl,-lddot"
    17161716                else
    17171717                        M1QN3LIB="${M1QN3_ROOT}/libm1qn3.a ${M1QN3_ROOT}/libddot.a"
    … …  
    18331833                HAVE_SCALAPACK=yes
    18341834                if test "${VENDOR}" == "win-msys2"; then
    1835                         SCALAPACKLIB="-Wl,${SCALAPACK_ROOT}/lib/libscalapack.a"
     1835                        SCALAPACKLIB="-Wl,-L${SCALAPACK_ROOT}/lib -Wl,-lscalapack"
    18361836                else
    18371837                        SCALAPACKLIB="-L${SCALAPACK_ROOT}/lib -lscalapack"
    … …  
    19151915                        *mingw*)
    19161916                                if test -d "${BLASLAPACK_ROOT}"; then
    1917                                         BLASLAPACKLIB="-L${BLASLAPACK_ROOT}/lib"
     1917                                        BLASLAPACKLIB="-Wl,-L${BLASLAPACK_ROOT}/lib"
    19181918                                        if ls ${BLASLAPACK_ROOT}/lib/libopenblas.* 1> /dev/null 2>&1; then
    19191919                                                BLASLAPACKLIB+=" -lopenblas"
    … …  
    19211921                                                BLASLAPACKLIB+=" -lf2clapack -lf2cblas"
    19221922                                        elif ls ${BLASLAPACK_ROOT}/lib/libflapack.* 1> /dev/null 2>&1; then
    1923                                                 BLASLAPACKLIB="-Wl,${BLASLAPACK_ROOT}/lib/libflapack.a -Wl,${BLASLAPACK_ROOT}/lib/libfblas.a"
     1923                                                BLASLAPACKLIB="-Wl,-L${BLASLAPACK_ROOT}/lib -Wl,-lflapack -Wl,-lfblas"
    19241924                                        else
    1925                                                 BLASLAPACKLIB+=" -llapack -lblas"
     1925                                                BLASLAPACKLIB+=" -Wl,-llapack -Wl,-lblas"
    19261926                                        fi
    19271927                                else
    1928                                         BLASLAPACKLIB="-Wl,${LAPACK_ROOT}/lib/liblapack.a -Wl,${BLAS_ROOT}/lib/libblas.a"
     1928                                        BLASLAPACKLIB="${LAPACK_ROOT}/lib/liblapack.a ${BLAS_ROOT}/lib/libblas.a"
    19291929                                fi
    19301930                        ;;
    … …  
    20532053                if test "x${MUMPS_ROOT}" == "x${PETSC_ROOT}"; then
    20542054                        if test "${VENDOR}" == "win-msys2"; then
    2055                                 MUMPSLIB="-Wl,${MUMPS_ROOT}/lib/libcmumps.a -Wl,${MUMPS_ROOT}/lib/libdmumps.a -Wl,${MUMPS_ROOT}/lib/libsmumps.a -Wl,${MUMPS_ROOT}/lib/libzmumps.a -Wl,${MUMPS_ROOT}/lib/libmumps_common.a -Wl,${MUMPS_ROOT}/lib/libpord.a"
     2055                                MUMPSLIB="-Wl,-L${MUMPS_ROOT}/lib -Wl,-lcmumps -Wl,-ldmumps -Wl,-lsmumps -Wl,-lzmumps -Wl,-lmumps_common -Wl,-lpord"
    20562056                        else
    20572057                                MUMPSLIB="-L${MUMPS_ROOT}/lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis -lzmumps -lmetis"

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh

    r27712 r27944  
    140140
    141141        # Check that MATLAB did not exit in error
    142         matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in|Illegal|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab.log`
     142        matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in|Illegal|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab.log | wc -l`
    143143
    144144        if [ ${matlabExitedInError} -ne 0 ]; then

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh

    r27823 r27944  
    139139        # Check that Python did not exit in error
    140140        pythonExitCode=`echo $?`
    141         pythonExitedInError=`grep -c -E "Error|No such file or directory|Permission denied|Standard exception|Traceback|bad interpreter|syntax error" python.log`
     141        pythonExitedInError=`grep -c -E "Error|No such file or directory|Permission denied|Standard exception|Traceback|bad interpreter|syntax error" python.log | wc -l`
    142142
    143143        if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then

  • issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh

    r27712 r27944  
    147147
    148148        # Check that MATLAB did not exit in error
    149         matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in|Illegal|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab.log`
     149        matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in|Illegal|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab.log | wc -l`
    150150
    151151        if [ ${matlabExitedInError} -ne 0 ]; then

  • issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh

    r27823 r27944  
    145145        # Check that Python did not exit in error
    146146        pythonExitCode=`echo $?`
    147         pythonExitedInError=`grep -c -E "Error|No such file or directory|Permission denied|Standard exception|Traceback|bad interpreter|syntax error" python.log`
     147        pythonExitedInError=`grep -c -E "Error|No such file or directory|Permission denied|Standard exception|Traceback|bad interpreter|syntax error" python.log | wc -l`
    148148
    149149        if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then

  • issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-matlab.sh

    r27712 r27944  
    3434# Check that MATLAB did not exit in error
    3535matlabExitCode=`echo $?`
    36 matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in|Illegal|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab.log`
     36matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in|Illegal|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab.log | wc -l`
    3737
    3838if [[ ${matlabExitCode} -ne 0 || ${matlabExitedInError} -ne 0 ]]; then

  • issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-python-3.sh

    r27613 r27944  
    3434# Check that Python did not exit in error
    3535pythonExitCode=`echo $?`
    36 pythonExitedInError=`grep -c -E "Error|No such file or directory|Permission denied|Standard exception|Traceback|bad interpreter|syntax error" python.log`
     36pythonExitedInError=`grep -c -E "Error|No such file or directory|Permission denied|Standard exception|Traceback|bad interpreter|syntax error" python.log | wc -l`
    3737
    3838if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then

  • issm/trunk-jpl/src/c/Makefile.am

    r27920 r27944  
    717717libISSMCore_la_FFLAGS = $(AM_FFLAGS)
    718718
    719 if !STANDALONE_LIBRARIES
    720719libISSMCore_la_LIBADD = $(CHACOLIB) $(DAKOTALIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(TAOLIB) $(M1QN3LIB) $(SEMICLIB) $(PLAPACKLIB) $(MPLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(ADOLCLIB) $(AMPILIB) $(ADJOINTMPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB)
    721720if FORTRAN
    … …  
    723722endif
    724723libISSMCore_la_LIBADD += $(OSLIBS)
    725 endif
    726724
    727725if NEOPZ
    … …  
    740738
    741739libISSMModules_la_CXXFLAGS = $(ALL_CXXFLAGS)
    742 if STANDALONE_LIBRARIES
    743 libISSMModules_la_LIBADD = ./libISSMCore.la
    744 else
    745740libISSMModules_la_LIBADD = ./libISSMCore.la $(TRIANGLELIB) $(CHACOLIB) $(BLASLAPACKLIB) $(OSLIBS)
    746 endif
    747741endif
    748742
    … …  
    765759AM_LDFLAGS += -Wl,-rpath,'@loader_path/../lib'
    766760else
    767 AM_LDFLAGS += -Wl,-rpath,'$$ORIGIN/../lib'
     761AM_LDFLAGS += -Wl,-static
    768762if !MSYS2
    769 AM_LDFLAGS += -static -Wl,--disable-new-dtags
     763AM_LDFLAGS += -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN/../lib'
    770764endif
    771765endif
    … …  
    791785
    792786if STANDALONE_LIBRARIES
     787if !MSYS2
    793788libISSMCore_la_LDFLAGS += -static
    794789if WRAPPERS
    795790libISSMModules_la_LDFLAGS += -static
     791endif
    796792endif
    797793endif
    … …  
    810806
    811807if STANDALONE_LIBRARIES
     808if !MSYS2
    812809libISSMOverload_la_LDFLAGS += -static
     810endif
    813811endif
    814812endif
    … …  
    842840# External packages
    843841LDADD += $(DAKOTALIB) $(SEMICLIB) $(M1QN3LIB) $(CHACOLIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(NEOPZLIB) $(TAOLIB) $(PLAPACKLIB) $(MPLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(BLACSLIB) $(HDF5LIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(AMPILIB) $(ADJOINTMPILIB) $(ADOLCLIB) $(MPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB) $(ESMFLIB)
    844 
    845842if FORTRAN
    846843LDADD += $(FLIBS) $(FORTRANLIB)

  • issm/trunk-jpl/src/wrappers/javascript/Makefile.am

    r26377 r27944  
    44EXEEXT=$(JAVASCRIPTWRAPPEREXT)
    55
    6 #define prefix (from http://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Defining-Directories.html)
    7 AM_CPPFLAGS+= -DISSM_PREFIX='"$(prefix)"'
     6# Define prefix (from http://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Defining-Directories.html)
     7AM_CPPFLAGS += -DISSM_PREFIX='"$(prefix)"'
    88
    9 js_scripts = ${ISSM_DIR}/src/wrappers/BamgMesher/BamgMesher.js \
    10                          ${ISSM_DIR}/src/wrappers/Triangle/Triangle.js \
    11                          ${ISSM_DIR}/src/wrappers/NodeConnectivity/NodeConnectivity.js\
    12                          ${ISSM_DIR}/src/wrappers/ContourToMesh/ContourToMesh.js\
    13                          ${ISSM_DIR}/src/wrappers/ElementConnectivity/ElementConnectivity.js\
    14                          ${ISSM_DIR}/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.js\
    15                          ${ISSM_DIR}/src/wrappers/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.js\
    16                          ${ISSM_DIR}/src/wrappers/IssmConfig/IssmConfig.js\
    17                          ${ISSM_DIR}/src/wrappers/Issm/issm.js
     9js_scripts = \
     10        ${ISSM_DIR}/src/wrappers/BamgMesher/BamgMesher.js \
     11        ${ISSM_DIR}/src/wrappers/Triangle/Triangle.js \
     12        ${ISSM_DIR}/src/wrappers/NodeConnectivity/NodeConnectivity.js \
     13        ${ISSM_DIR}/src/wrappers/ContourToMesh/ContourToMesh.js \
     14        ${ISSM_DIR}/src/wrappers/ElementConnectivity/ElementConnectivity.js \
     15        ${ISSM_DIR}/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.js \
     16        ${ISSM_DIR}/src/wrappers/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.js \
     17        ${ISSM_DIR}/src/wrappers/IssmConfig/IssmConfig.js \
     18        ${ISSM_DIR}/src/wrappers/Issm/issm.js
    1819
    1920bin_SCRIPTS =  issm-prebin.js
    … …  
    2122issm-prebin.js: ${js_scripts}
    2223        cat ${js_scripts}  > issm-prebin.js
    23        
    24 #javascript io{{{
    25 if !WINDOWS
     24
     25# JavaScript I/O{{{
    2626lib_LTLIBRARIES = libISSMJavascript.la
    27 else
    28 noinst_LTLIBRARIES = libISSMJavascript.la
    29 lib_LTLIBRARIES =
    30 endif
    3127
    32 io_sources=   ./io/WriteJavascriptData.cpp\
    33                                 ./io/FetchJavascriptData.cpp
     28io_sources = \
     29        ./io/WriteJavascriptData.cpp \
     30        ./io/FetchJavascriptData.cpp
    3431
    35 ALLCXXFLAGS= -fPIC -D_WRAPPERS_ $(CXXFLAGS) $(CXXOPTFLAGS) 
     32ALLCXXFLAGS= -fPIC -D_WRAPPERS_ $(CXXFLAGS) $(CXXOPTFLAGS)
    3633
    3734libISSMJavascript_la_SOURCES = $(io_sources)
    3835libISSMJavascript_la_CXXFLAGS= $(ALLCXXFLAGS)
    3936#}}}
    40 #api io{{{
    41 if !WINDOWS
     37# API I/O{{{
    4238lib_LTLIBRARIES += libISSMApi.la
    43 else
    44 noinst_LTLIBRARIES += libISSMApi.la
    45 endif
    4639
    4740api_sources= ./io/ApiPrintf.cpp
    … …  
    5043libISSMApi_la_CXXFLAGS= $(ALLCXXFLAGS)
    5144#}}}
    52 #Wrappers {{{
    53 bin_PROGRAMS =           IssmModule
     45# Wrappers {{{
     46bin_PROGRAMS = IssmModule
    5447#}}}
    5548
    5649# Dependencies {{{
    5750
    58 #Triangle library
    59 AM_CXXFLAGS =  -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER -D_WRAPPERS_
    60 AM_CXXFLAGS +=  -D_HAVE_JAVASCRIPT_MODULES_ -fPIC
     51# Triangle
     52AM_CXXFLAGS = -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER -D_WRAPPERS_
     53AM_CXXFLAGS += -D_HAVE_JAVASCRIPT_MODULES_ -fPIC
    6154
    6255deps = ./libISSMJavascript.la ../../c/libISSMModules.la ../../c/libISSMCore.la ./libISSMApi.la
    6356
    64 #Optimization flags:
    65 AM_CXXFLAGS += $(CXXOPTFLAGS) 
     57# Optimization flags
     58AM_CXXFLAGS += $(CXXOPTFLAGS)
    6659#}}}
    6760# Module sources and dependencies {{{
    68 if !WINDOWS
    6961libISSMJavascript_la_LIBADD = ./../../c/libISSMCore.la ./../../c/libISSMModules.la $(MPILIB) $(PETSCLIB) $(MKLLIB) $(GSLLIB) $(MATHLIB)
     62
     63if STANDALONE_LIBRARIES
     64if !MSYS2
     65libISSMJavascript_la_LDFLAGS = -static
     66libISSMApi_la_LDFLAGS += -static
     67endif
     68deps += $(DAKOTALIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(TAOLIB) $(M1QN3LIB) $(SEMICLIB) $(PLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(TRIANGLELIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MPILIB) $(NEOPZLIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(ADOLCLIB) $(AMPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB) $(OSLIBS)
    7069endif
    7170
    72 if STANDALONE_LIBRARIES
    73 libISSMJavascript_la_LDFLAGS = -static
    74 deps += $(PETSCLIB) $(TAOLIB) $(M1QN3LIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(TRIANGLELIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB)   $(ADOLCLIB) $(AMPILIB) $(METEOIOLIB) $(SNOWPACKLIB)
    75 endif
     71libISSMApi_la_LIBADD = $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB) $(MATHLIB)
    7672
    77 if !WINDOWS
    78 libISSMApi_la_LIBADD = $(MPILIB) $(PETSCLIB) $(GSLLIB) $(MATHLIB) $(MEXLIB)
    79 endif
     73IssmModule_SOURCES = \
     74        ../BamgMesher/BamgMesher.cpp \
     75        ../Triangle/Triangle.cpp \
     76        ../NodeConnectivity/NodeConnectivity.cpp \
     77        ../ContourToMesh/ContourToMesh.cpp \
     78        ../ElementConnectivity/ElementConnectivity.cpp \
     79        ../InterpFromGridToMesh/InterpFromGridToMesh.cpp \
     80        ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp \
     81        ../IssmConfig/IssmConfig.cpp \
     82        ../Issm/issm.cpp
    8083
    81 if STANDALONE_LIBRARIES
    82 libISSMApi_la_LDFLAGS = -static
    83 endif
    84 
    85 IssmModule_SOURCES = ../BamgMesher/BamgMesher.cpp \
    86                      ../Triangle/Triangle.cpp \
    87                                          ../NodeConnectivity/NodeConnectivity.cpp\
    88                                          ../ContourToMesh/ContourToMesh.cpp\
    89                                          ../ElementConnectivity/ElementConnectivity.cpp\
    90                                          ../InterpFromGridToMesh/InterpFromGridToMesh.cpp\
    91                                          ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp\
    92                                          ../IssmConfig/IssmConfig.cpp\
    93                                          ../Issm/issm.cpp
    94 
    95 IssmModule_CXXFLAGS= -fPIC -D_DO_NOT_LOAD_GLOBALS_  --memory-init-file 0 $(AM_CXXFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) -s EXPORTED_FUNCTIONS="['_BamgMesherModule','_TriangleModule','_NodeConnectivityModule','_ContourToMeshModule','_ElementConnectivityModule','_InterpFromGridToMeshModule','_InterpFromMeshToMesh2dModule','_IssmConfigModule','_IssmModule']"  -s DISABLE_EXCEPTION_CATCHING=0 -s ALLOW_MEMORY_GROWTH=1 -s INVOKE_RUN=0
    96 IssmModule_LDADD = ${deps} $(TRIANGLELIB)  $(GSLLIB)
     84IssmModule_CXXFLAGS= -fPIC -D_DO_NOT_LOAD_GLOBALS_  --memory-init-file 0 $(AM_CXXFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) -s EXPORTED_FUNCTIONS="['_BamgMesherModule','_TriangleModule','_NodeConnectivityModule','_ContourToMeshModule','_ElementConnectivityModule','_InterpFromGridToMeshModule','_InterpFromMeshToMesh2dModule','_IssmConfigModule','_IssmModule']" -s DISABLE_EXCEPTION_CATCHING=0 -s ALLOW_MEMORY_GROWTH=1 -s INVOKE_RUN=0
     85IssmModule_LDADD = ${deps} $(TRIANGLELIB) $(GSLLIB)
    9786#}}}

  • issm/trunk-jpl/src/wrappers/matlab/Makefile.am

    r27866 r27944  
    88
    99#matlab io{{{
    10 if !WINDOWS
    1110lib_LTLIBRARIES = libISSMMatlab.la
    12 else
    13 noinst_LTLIBRARIES = libISSMMatlab.la
    14 lib_LTLIBRARIES =
    15 endif
    1611
    1712io_sources = \
    … …  
    3328#}}}
    3429#api io{{{
    35 if !WINDOWS
    3630lib_LTLIBRARIES += libISSMApi.la
    37 else
    38 noinst_LTLIBRARIES += libISSMApi.la
    39 endif
    4031
    4132if !MSYS2
    … …  
    122113AM_LDFLAGS += -Wl,-rpath,'@rpath'
    123114else
    124 AM_LDFLAGS += -Wl,-static -Wl,-lbacktrace -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN'
     115AM_LDFLAGS += -Wl,-lbacktrace
     116if !MSYS2
     117AM_LDFLAGS += -Wl,-static -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN'
     118endif
    125119endif
    126120endif
    … …  
    133127deps += ./libISSMApi.la
    134128endif
    135 
    136 # if WINDOWS
    137 # deps += $(METISLIB)
    138 # endif
    139129
    140130if ADOLC
    … …  
    152142#}}}
    153143# Module sources and dependencies {{{
    154 if !WINDOWS
    155144libISSMMatlab_la_LIBADD = ./../../c/libISSMCore.la ./../../c/libISSMModules.la $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(MPILIB) $(NEOPZLIB) $(MKLLIB) $(GSLLIB) $(PROJLIB) $(MATHLIB) $(MEXLIB)
    156 endif
    157145
    158146if VERSION
    … …  
    165153
    166154if STANDALONE_LIBRARIES
     155if !MSYS2
    167156libISSMMatlab_la_LDFLAGS += -static
    168157libISSMApi_la_LDFLAGS += -static
     158endif
    169159deps += $(DAKOTALIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(TAOLIB) $(M1QN3LIB) $(SEMICLIB) $(PLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(TRIANGLELIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MPILIB) $(NEOPZLIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(ADOLCLIB) $(AMPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB) $(OSLIBS) ${LIBADD_FOR_MEX}
    170160endif
    171161
    172 if !WINDOWS
    173162libISSMApi_la_LIBADD = $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB) $(MATHLIB) $(MEXLIB)
    174 endif
    175163
    176164BamgConvertMesh_matlab_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp

  • issm/trunk-jpl/src/wrappers/python/Makefile.am

    r27866 r27944  
    66
    77#python io{{{
    8 if !WINDOWS
    98lib_LTLIBRARIES = libISSMPython.la
    10 else
    11 noinst_LTLIBRARIES = libISSMPython.la
    12 lib_LTLIBRARIES =
    13 endif
    149
    1510io_sources = \
    … …  
    3126#}}}
    3227#api io{{{
    33 if !WINDOWS
    3428lib_LTLIBRARIES += libISSMApi.la
    35 else
    36 noinst_LTLIBRARIES += libISSMApi.la
    37 endif
    3829
    3930if !MSYS2
    … …  
    10596if STANDALONE_MODULES
    10697if MAC
     98AM_LDFLAGS += -Wl,-rpath,'@rpath'
    10799else
    108 AM_LDFLAGS += -Wl,-static -Wl,-lbacktrace -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN'
     100AM_LDFLAGS += -Wl,-lbacktrace
     101if !MSYS2
     102AM_LDFLAGS += -Wl,-static -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN'
     103endif
    109104endif
    110105endif
    … …  
    133128
    134129if STANDALONE_LIBRARIES
     130if !MSYS2
    135131libISSMPython_la_LDFLAGS = -static
    136132libISSMApi_la_LDFLAGS = -static
     133endif
    137134deps += $(DAKOTALIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(TAOLIB) $(NEOPZLIB) $(M1QN3LIB) $(SEMICLIB) $(PLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(TRIANGLELIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(CHACOLIB) $(SCOTCHLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(ADOLCLIB) $(AMPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(OSLIBS)
    138135endif
    139136
    140 libISSMApi_la_LIBADD = $(PETSCLIB) $(HDF5LIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(MATHLIB)
     137libISSMApi_la_LIBADD = $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJLIB) $(MATHLIB)
    141138
    142139BamgConvertMesh_python_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp
Note: See TracChangeset for help on using the changeset viewer.