Changeset 19714

Timestamp:

11/12/15 18:49:52 (9 years ago)

Author:

Eric.Larour

Message:

CHG: found a way to avoid repeat of global.h inclusion only for javascript wrappers.

Location:

issm/trunk-jpl/src

Files:

• c/main/globals.h (modified) (2 diffs)
• wrappers/TriMesh/TriMesh.h (modified) (2 diffs)
• wrappers/javascript/Makefile.am (modified) (1 diff)

issm/trunk-jpl/src/c/main/globals.h

@@ -5 +5 @@
 #ifndef _GLOBALS_H_
 #define _GLOBALS_H_
-
 #include "../shared/io/Comm/IssmComm.h"
 #include "../toolkits/ToolkitOptions.h"
 
 /*Communicators: */
+#ifndef _DO_NOT_LOAD_GLOBALS_ 
 ISSM_MPI_Comm IssmComm::comm;
 bool IssmComm::parallel;
@@ -17 +17 @@
  * often used when Petsc is not allowed*/
 char* ToolkitOptions::toolkitoptions;
+#endif
 
 #endif

issm/trunk-jpl/src/wrappers/TriMesh/TriMesh.h

@@ -15 +15 @@
 #ifdef _HAVE_PYTHON_
 #define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol
+#endif
+
+#ifdef _HAVE_JAVASCRIPT_MODULES_
+#undef _DO_NOT_LOAD_GLOBALS_
 #endif
 
@@ -66 +70 @@
 #define SEGMENTS          psegments,pnsegs
 #define SEGMENTMARKERLIST psegmentmarkers,pnsegs
+#define _DO_NOT_LOAD_GLOBALS_//we only load globals for TriMeshModule.js, not other modules!
 #endif
 

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

@@ -74 +74 @@
 IssmModule_SOURCES = ../TriMesh/TriMesh.cpp \
                                          ../NodeConnectivity/NodeConnectivity.cpp
-IssmModule_CXXFLAGS= -fPIC --memory-init-file 0 $(AM_CXXFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) -s EXPORTED_FUNCTIONS="['_TriMeshModule','_NodeConnectivityModule']"  -s DISABLE_EXCEPTION_CATCHING=0
+IssmModule_CXXFLAGS= -fPIC -D_DO_NOT_LOAD_GLOBALS_ --memory-init-file 0 $(AM_CXXFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) -s EXPORTED_FUNCTIONS="['_TriMeshModule','_NodeConnectivityModule']"  -s DISABLE_EXCEPTION_CATCHING=0
 IssmModule_LDADD = ${deps} $(TRIANGLELIB) 
 #}}}