Changeset 24612

Timestamp:

02/27/20 17:52:15 (5 years ago)

Author:

jdquinn

Message:

CHG: Updated config for Triangle for Mac build (was missing install_name)

Location:

issm/trunk-jpl/externalpackages/triangle

Files:

• configs/mac/configure.make (modified) (1 diff)
• configs/makefile (modified) (1 diff)
• install-mac.sh (modified) (1 diff)

issm/trunk-jpl/externalpackages/triangle/configs/mac/configure.make

@@ -1 @@
-CC=clang
+CC=gcc
 CSWITCHES= $(CFLAGS) -DNO_TIMER -fpic
 TRILIBDEFS= -DTRILIBRARY

issm/trunk-jpl/externalpackages/triangle/configs/makefile

@@ -35 +35 @@
 
 libtriangle.dylib: $(OBJECTS)
-        $(CC) $(CSWITCHES) $(TRILIBDEFS) -dynamiclib -install_name $(PREFIX)/$@ -o $@ triangle.c
+        $(CC) $(CSWITCHES) $(TRILIBDEFS) -dynamiclib -install_name ${INSTALL_DIR}/lib/$@ -o $@ triangle.c
+
+libtriangle.lib: $(OBJECTS)
+        lib -out:triangle.$(STATIC_LIB_EXT) $(OBJECTS)
 
 libtriangle.so: $(SOURCES)

issm/trunk-jpl/externalpackages/triangle/install-mac.sh

@@ -5 +5 @@
 # Constants
 #
-INSTALL_DIR="install"
+export INSTALL_DIR="${ISSM_DIR}/externalpackages/triangle/install"
 
 # Cleanup