Changeset 24611

Timestamp:

02/27/20 16:19:24 (5 years ago)

Author:

jdquinn

Message:

CHG: Updated config for Triangle for Windows build

Location:

issm/trunk-jpl

Files:

• etc/environment.sh (modified) (1 diff)
• externalpackages/triangle/install-windows-static.sh (copied) (copied from issm/trunk-jpl/externalpackages/triangle/install-windows.sh ) (1 diff)
• externalpackages/triangle/makefile (modified) (2 diffs)
• jenkins/windows (modified) (1 diff)

issm/trunk-jpl/etc/environment.sh

@@ -446 +446 @@
 
 TRIANGLE_DIR="${ISSM_DIR}/externalpackages/triangle/install"
-ld_library_path_append "${TRIANGLE_DIR}/lib"
+if [ -d "${TRIANGLE_DIR}" ]; then
+        ld_library_path_append "${TRIANGLE_DIR}/lib"
+        dyld_library_path_append "${TRIANGLE_DIR}/lib"
+fi

issm/trunk-jpl/externalpackages/triangle/install-windows-static.sh

@@ -24 +24 @@
 # Compile
 cd src
-make shared
+make static
 
 # Install

issm/trunk-jpl/externalpackages/triangle/makefile

@@ -1 @@
-#Adaptation of Triangle makefile to compile only the triangle.c file, 
-#into a standalone library that can then be used to compile mex modules
-
 include ./configure.make
 
@@ -16 +13 @@
 endif
 
-TRILIBDEFS = -DTRILIBRARY
-
-all: triangle.$(LIB_EXT)
-
+SOURCES=triangle.c triangle.h
 OBJECTS=triangle.$(OBJ_EXT)
 
-triangle.$(LIB_EXT): $(OBJECTS)
-        $(AR) cr  triangle.$(LIB_EXT) $(OBJECTS)
-        $(RANLIB) triangle.$(LIB_EXT)
+all: libtriangle.$(STATIC_LIB_EXT) libtriangle.$(SHARED_LIB_EXT)
 
-triangle.$(OBJ_EXT): triangle.c triangle.h
+objects: $(OBJECTS)
+
+shared: libtriangle.$(SHARED_LIB_EXT)
+
+static: libtriangle.$(STATIC_LIB_EXT)
+
+triangle.$(OBJ_EXT): $(SOURCES)
         $(CC) $(CSWITCHES) $(TRILIBDEFS) -c triangle.c
 
-clean: 
+libtriangle.$(STATIC_LIB_EXT): $(OBJECTS)
+        $(AR) cr $@ $(OBJECTS)
+        $(RANLIB) $@
+
+libtriangle.dll: $(SOURCES)
+        $(CC) $(CSWITCHES) $(TRILIBDEFS) -shared -o $@ triangle.c
+
+libtriangle.dylib: $(OBJECTS)
+        $(CC) $(CSWITCHES) $(TRILIBDEFS) -dynamiclib -install_name $(PREFIX)/$@ -o $@ triangle.c
+
+libtriangle.lib: $(OBJECTS)
+        lib -out:triangle.$(STATIC_LIB_EXT) $(OBJECTS)
+
+libtriangle.so: $(SOURCES)
+        $(CC) $(CSWITCHES) $(TRILIBDEFS) -shared -o $@ triangle.c
+
+clean:
         rm -rf *.$(LIB_EXT) *.$(OBJ_EXT) *.LIB *.LST *.$(OBJ_EXT)bj *.BAK

issm/trunk-jpl/jenkins/windows

@@ -41 +41 @@
                                                 petsc       install-3.6-win10.sh
                                                 metis       install-4.0-win10.sh
-                                                triangle    install-windows.sh
+                                                triangle    install-windows-static.sh
                                                 shell2junit install.sh"