[cig-commits] [commit] master: Fix SWIG/Python, MPI in Quakelib (11620a2)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/vc

On branch  : master
Link       : https://github.com/geodynamics/vc/compare/f1609021246ebdd14b3c943f36ecfa5bc49d5691...290787dea3d3c04f5299b765cd20263898a787a5

>---------------------------------------------------------------

commit 11620a211e148883179de3c77d8529f889f59fc4
Author: Eric Heien <eheien at Blast-ThickNeck.local>
Date:   Fri Sep 5 16:41:25 2014 -0700

    Fix SWIG/Python, MPI in Quakelib


>---------------------------------------------------------------

11620a211e148883179de3c77d8529f889f59fc4
 quakelib/CMakeLists.txt | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/quakelib/CMakeLists.txt b/quakelib/CMakeLists.txt
index dcc9439..13ceb68 100644
--- a/quakelib/CMakeLists.txt
+++ b/quakelib/CMakeLists.txt
@@ -33,6 +33,13 @@ ENDIF(PYTHONLIBS_FOUND)
 
 FIND_PACKAGE(PythonInterp)
 
+# Check for MPI
+FIND_PACKAGE(MPI)
+IF(DEFINED MPI_C_FOUND AND MPI_CXX_FOUND)
+    ADD_DEFINITIONS(${MPI_C_COMPILE_FLAGS})
+    INCLUDE_DIRECTORIES(${MPI_C_INCLUDE_PATH})
+ENDIF(DEFINED MPI_C_FOUND AND MPI_CXX_FOUND)
+
 # Check for HDF5 and use it if available
 FIND_PACKAGE(HDF5 COMPONENTS C HL)
 IF(HDF5_FOUND)
@@ -84,6 +91,13 @@ IF (HDF5_FOUND)
     TARGET_LINK_LIBRARIES (quakelib ${HDF5_LIBRARIES})
 ENDIF (HDF5_FOUND)
 
+IF(MPI_C_FOUND)
+    TARGET_LINK_LIBRARIES (quakelib ${MPI_C_LIBRARIES})
+    TARGET_LINK_LIBRARIES (quakelib ${MPI_CXX_LIBRARIES})
+    SET_TARGET_PROPERTIES(quakelib PROPERTIES COMPILE_FLAGS "${MPI_C_COMPILE_FLAGS} ${MPI_CXX_COMPILE_FLAGS}")
+    SET_TARGET_PROPERTIES(quakelib PROPERTIES LINK_FLAGS "${MPI_C_LINK_FLAGS} ${MPI_CXX_LINK_FLAGS}")
+ENDIF(MPI_C_FOUND)
+
 IF (GEOGRAPHICLIB_FOUND)
     TARGET_LINK_LIBRARIES (quakelib ${GeographicLib_LIBRARIES}) 
 ENDIF (GEOGRAPHICLIB_FOUND)
@@ -103,7 +117,7 @@ INSTALL(TARGETS quakelib
 ADD_SUBDIRECTORY(python)
 
 # If we have Python, run a set of tests with Python based scripts
-IF (PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND)
+IF (PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND AND SWIG_FOUND)
     ADD_TEST(NAME CondUnitTest COMMAND ${PYTHON_EXECUTABLE} ${QUAKELIB_TEST_DIR}/CondUnitTest.py)
     SET_PROPERTY(TEST CondUnitTest PROPERTY ENVIRONMENT "PYTHONPATH=${QUAKELIB_BINARY_DIR}/python/")
     ADD_TEST(NAME FricUnitTest COMMAND ${PYTHON_EXECUTABLE} ${QUAKELIB_TEST_DIR}/FricUnitTest.py)
@@ -122,5 +136,5 @@ IF (PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND)
     SET_PROPERTY(TEST MetadataUnitTest PROPERTY ENVIRONMENT "PYTHONPATH=${QUAKELIB_BINARY_DIR}/python/")
     ADD_TEST(NAME RectBoundTest COMMAND ${PYTHON_EXECUTABLE} ${QUAKELIB_TEST_DIR}/RectBoundTest.py)
     SET_PROPERTY(TEST RectBoundTest PROPERTY ENVIRONMENT "PYTHONPATH=${QUAKELIB_BINARY_DIR}/python/")
-ENDIF(PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND)
+ENDIF(PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND AND SWIG_FOUND)