Changeset 13906

Timestamp:

11/07/12 20:58:27 (12 years ago)

Author:

Eric.Larour

Message:

CHG: missing WRAPPERS symbol for compilation of python modules.

Location:

issm/trunk-jpl

Files:

• configs/config-macosx64-larour-ad.sh (modified) (2 diffs)
• src/wrappers/python/Makefile.am (modified) (2 diffs)

issm/trunk-jpl/configs/config-macosx64-larour-ad.sh

@@ -1 +1 @@
 #!/bin/sh
+
+pythonversion=2.7
 
 ./configure \
@@ -8 +10 @@
         --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
         --with-matlab-dir=$MATLAB_DIR \
+        --with-python-dir=$ISSM_DIR/externalpackages/python/install\
+        --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/Library/Frameworks/Python.framework/Versions/$pythonversion/lib/python$pythonversion/site-packages/numpy/core/include/numpy\
         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
 

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

@@ -50 +50 @@
 
 #Triangle library
-AM_CXXFLAGS =  -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER
+AM_CXXFLAGS =  -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER -D_WRAPPERS_
 
 #Python part
@@ -75 +75 @@
 else             
 deps += ../../c/libISSMModules.a ../../c/libISSMCore.a           
+if ADOLC
+deps += $(ADOLCLIB)
+endif
+
 endif