Changeset 20386

Timestamp:

03/30/16 15:13:51 (9 years ago)

Author:

glperez

Message:

CHG: Changing stuff to fix annoying flags that Windows does not recognize.

Location:

issm/trunk-jpl

Files:

• jenkins/windows (modified) (1 diff)
• m4/issm_options.m4 (modified) (1 diff)
• src/c/Makefile.am (modified) (8 diffs)

issm/trunk-jpl/jenkins/windows

@@ -10 +10 @@
 ISSM_CONFIG='--prefix=$ISSM_DIR \
         --with-vendor=MSVC-Win64  \
+        --with-cxxoptflags='' \
    --disable-static \
         --enable-standalone-libraries \

issm/trunk-jpl/m4/issm_options.m4

@@ -1996 +1996 @@
         AC_ARG_WITH([cxxoptflags],
           AS_HELP_STRING([--with-cxxoptflags = CXXOPTFLAGS], [optimization using CXX flags, ex: --with-cxxoptflags=-march=opteron -O3]),
-          [CXXOPTFLAGS=$withval],[CXXOPTFLAGS="-g -O2"]) 
+          [CXXOPTFLAGS=$withval],[CXXOPTFLAGS="-g -O2 -fPIC"]) 
         AC_MSG_CHECKING(for c++ optimization flags)
         AC_SUBST([CXXOPTFLAGS])

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

@@ -585 +585 @@
 #}}}
 #Library flags and sources {{{
-ALLCXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) 
+ALLCXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS) 
 
 libISSMCore_la_SOURCES  = $(issm_sources)
@@ -643 +643 @@
 libISSMOverload_la_SOURCES = ./shared/String/ApiPrintf.cpp
 
-libISSMOverload_la_CFLAGS  = -fPIC -D_C_ $(COPTFLAGS) $(CFLAGS)
+libISSMOverload_la_CFLAGS  = -D_C_ -fPIC $(COPTFLAGS) $(CFLAGS)
 #}}}
 
@@ -675 +675 @@
 
 issm_SOURCES = main/issm.cpp
-issm_CXXFLAGS= -fPIC
+issm_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS)
 
 issm_slr_SOURCES = main/issm_slr.cpp
-issm_slr_CXXFLAGS= -fPIC
+issm_slr_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS)
 
 
@@ -684 +684 @@
 bin_PROGRAMS += kriging
 kriging_SOURCES = main/kriging.cpp
-kriging_CXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
+kriging_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
 endif
 
@@ -690 +690 @@
 bin_PROGRAMS += issm_dakota
 issm_dakota_SOURCES = main/issm_dakota.cpp
-issm_dakota_CXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
+issm_dakota_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
 issm_dakota_LDADD= $(LDADD)
 endif
@@ -706 +706 @@
 #libAD_a_SOURCES = ./mini1.ad.c
 libAD_la_SOURCES = 
-libAD_la_CFLAGS = -fPIC -D_C_ $(COPTFLAGS)
+libAD_la_CFLAGS = -D_C_ -fPIC $(COPTFLAGS)
 
 #test rose preprocessing 
@@ -712 +712 @@
         testTranslator -rose:o $@ -rose:skipfinalCompileStep -DHAVE_CONFIG_H -D_C_ -I. -I../.. $(INCLUDES) $<
 libISSMRose_la_SOURCES = $(libISSMCore_a_SOURCES:.cpp=.r2cpp.cpp)
-libISSMRose_la_CXXFLAGS= -fPIC -D_C_ $(CXXOPTFLAGS)
+libISSMRose_la_CXXFLAGS= -D_C_ $(CXXOPTFLAGS)
 
 #Automatic differentiation rules: 
@@ -722 +722 @@
 issmRose_exe_LDADD = ./libISSMRose.a $(LDADD)
 issmRose_exe_SOURCES = main/issm.cpp
-issmRose_exe_CXXFLAGS= -fPIC $(CXXOPTFLAGS) $(COPTFLAGS) 
+issmRose_exe_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
 LDADD +=  $(ADIC2LIB) 
 endif #}}}