Simply fence off global definition under macOS for JavaScript modules

Author: TidbitSoftware

jenkins/ross-debian_linux-javascript

@@ -14,7 +14,6 @@ ISSM_CONFIG='\
 	--without-fortran \
 	--without-Sealevelchange \
 	--without-Love \
-	--without-kml \
 	--without-kriging \
 	--with-gsl-dir="${ISSM_DIR}/externalpackages/gsl/install" \
 	--with-triangle-dir="${ISSM_DIR}/externalpackages/triangle/install" \

src/wrappers/Triangle/Triangle.h

@@ -16,6 +16,13 @@
 #define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol
 #endif
 
+#if _IS_MAC_ == 0
+#ifdef _HAVE_JAVASCRIPT_MODULES_
+#undef _DO_NOT_LOAD_GLOBALS_ /*only module where this needs to be undefined, so as to 
+							   not include IssmComm several times in the JavaScript module construct.*/
+#endif
+#endif
+
 /*Header files: */
 #include "../bindings.h"
 #include "../../c/main/globals.h"

src/wrappers/javascript/Makefile.am

@@ -93,7 +93,7 @@ IssmModule_SOURCES = \
 	../IssmConfig/IssmConfig.cpp \
 	../Issm/issm.cpp
 
-IssmModule_CXXFLAGS= -O2 -fPIC -D_DO_NOT_LOAD_GLOBALS_ $(AM_CXXFLAGS) $(CXXFLAGS) -s EXPORTED_FUNCTIONS="['_free','_malloc','cwrap','getValue','_BamgMesherModule','_TriangleModule','_NodeConnectivityModule','_ContourToMeshModule','_ElementConnectivityModule','_InterpFromGridToMeshModule','_InterpFromMeshToMesh2dModule','_IssmConfigModule','_IssmModule']" -s DISABLE_EXCEPTION_CATCHING=0 -s ALLOW_MEMORY_GROWTH=1 -s INVOKE_RUN=0
+IssmModule_CXXFLAGS= -O2 -fPIC -D_DO_NOT_LOAD_GLOBALS_ $(AM_CXXFLAGS) $(CXXFLAGS) -sEXPORTED_FUNCTIONS="['_free','_malloc','cwrap','getValue','_BamgMesherModule','_TriangleModule','_NodeConnectivityModule','_ContourToMeshModule','_ElementConnectivityModule','_InterpFromGridToMeshModule','_InterpFromMeshToMesh2dModule','_IssmConfigModule','_IssmModule']" -sDISABLE_EXCEPTION_CATCHING=0 -sALLOW_MEMORY_GROWTH=1 -sINVOKE_RUN=0
 # Uncomment to disable WebAssembly and only emit JavaScript
 IssmModule_CXXFLAGS+= -sWASM=0
 # Uncomment to build JavaScript that only runs on the Web (removes support for Node.js and other environments)