Updated CMake to properly deal with MPI

IllinoisRocstar · Nov 20, 2015 · cd70ae2 · cd70ae2
1 parent 5596b8a
commit cd70ae2
Show file tree

Hide file tree

Showing 20 changed files with 193 additions and 209 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,9 +11,7 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK )
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 ENDIF()
 if (NOT CMAKE_BUILD_TYPE)
   message(STATUS "No build type selected, default to Release")
@@ -83,7 +81,9 @@ add_subdirectory(testing)
 
 include_directories(./Roccom/include ./Rocman/include)
 add_executable(rocstar src/rocstar.C)
-target_link_libraries(rocstar Rocman Roccomf Roccom ${IRAD_LIB})
+set_source_files_properties(src/rocstar.C PROPERTIES COMPILE_FLAGS "${MPI_CXX_COMPILE_FLAGS}")
+set_target_properties(rocstar PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+target_link_libraries(rocstar Rocman Roccomf Roccom ${IRAD_LIB} ${MPI_CXX_LIBRARIES})
 
 INSTALL(TARGETS rocstar RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
 

diff --git a/Rocburn/CMakeLists.txt b/Rocburn/CMakeLists.txt
@@ -8,9 +8,7 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK -DMPI)
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 ENDIF()
 find_library(HDF4_LIB df HINTS /usr/lib/hdf /usr/lib64/hdf)
 find_library(MFHDF_LIB mfhdf HINTS /usr/lib/hdf /usr/lib64/hdf)
@@ -33,7 +31,7 @@ FILE (GLOB PY9_SRCS  ./Rocburn_PY/*.f90)
 FILE (GLOB PYF_SRCS  ./Rocburn_PY/*.f)
 SET(LIB_SRCS ${CORE_SRCS} ${APN_SRCS} ${ZN_SRCS} ${PY9_SRCS} ${PYF_SRCS})
 SET(ALL_SRCS ${LIB_SRCS})
-set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC" )
+set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC ${MPI_Fortran_COMPILE_FLAGS}" )
 #set(TEST_SRCS src/MANTest.C)
 
 # rpath settings
@@ -49,6 +47,7 @@ ELSE()
   add_library(Rocburn STATIC ${LIB_SRCS})
   add_definitions( -DSTATIC_LINK )
 ENDIF()
-target_link_libraries(Rocburn Rocout Rocin Roccomf Roccom)
+target_link_libraries(Rocburn Rocout Rocin Roccomf Roccom ${MPI_Fortran_LIBRARIES})
+SET_TARGET_PROPERTIES(Rocburn PROPERTIES LINK_FLAGS "${MPI_Fortran_LINK_FLAGS}")
 
 INSTALL(TARGETS Rocburn RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
diff --git a/Roccom/CMakeLists.txt b/Roccom/CMakeLists.txt
@@ -1,15 +1,6 @@
 cmake_minimum_required (VERSION 2.8)
 project(Roccom)
 ENABLE_LANGUAGE( CXX Fortran )
-IF(NOT ENABLE_MPI)
-  add_definitions( -DDUMMY_MPI )
-ELSE()
-  FIND_PACKAGE(MPI REQUIRED)
-  add_definitions( -DMPICH_IGNORE_CXX_SEEK )
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
-ENDIF()
 include(FortranCInterface)
 FortranCInterface_HEADER(${PROJECT_SOURCE_DIR}/include/FC.h MACRO_NAMESPACE "FC_")
 FortranCInterface_VERIFY(CXX QUIET)
@@ -19,11 +10,21 @@ set (EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single directo
 set (LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib CACHE PATH "Single directory for all libraries and archives.")
 mark_as_advanced (LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
 
+IF(NOT ENABLE_MPI)
+  add_definitions( -DDUMMY_MPI )
+ELSE()
+  FIND_PACKAGE(MPI REQUIRED)
+  add_definitions( -DMPICH_IGNORE_CXX_SEEK )
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+ENDIF()
+
 #INCLUDE(CTest)
 
 find_library(DL_LIB dl)
 set (LIB_SRCS src/roccom_c.C src/assertion.C src/roccom_exception.C src/commpi.C src/Roccom_base.C src/Attribute.C src/Connectivity.C src/Window.C src/Pane.C src/Element_accessors.C)
+set_source_files_properties(${LIB_SRCS} src/roccom_f.C PROPERTIES COMPILE_FLAGS "${MPI_CXX_COMPILE_FLAGS}" )
 set (FLIB_SRCS src/roccom_f.C src/m_pointers.f90 src/utilities.f90)
+set_source_files_properties(src/m_pointers.f90 src/utilities.f90 PROPERTIES COMPILE_FLAGS "${MPI_Fortran_COMPILE_FLAGS}")
 set (ALL_SRCS "${LIB_SRCS} ${FLIB_SRCS}")
 set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC" )
 #set(TEST_SRCS src/COMTest.C)
@@ -34,15 +35,22 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 include_directories(include)
 
-add_library(Roccomf STATIC ${FLIB_SRCS})
 
 IF(NOT BUILD_STATIC)
   add_library(Roccom SHARED ${LIB_SRCS})
+  add_library(Roccomf SHARED ${FLIB_SRCS})
 ELSE()
-  add_library(Roccomf STATIC ${LIB_SRCS})
+  add_library(Roccom STATIC ${LIB_SRCS})
+  add_library(Roccomf STATIC ${FLIB_SRCS})
   add_definitions( -DSTATIC_LINK )
 ENDIF()
-target_link_libraries(Roccom ${DL_LIB})
+target_link_libraries(Roccom ${DL_LIB} ${MPI_CXX_LIBRARIES})
+target_link_libraries(Roccomf ${MPI_Fortran_LIBRARIES})
+
+IF(MPI_LINK_FLAGS)
+  SET_TARGET_PROPERTIES(Roccom PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+  SET_TARGET_PROPERTIES(Roccomf PROPERTIES LINK_FLAGS "${MPI_Fortran_LINK_FLAGS}")
+ENDIF()
 
 add_subdirectory(Rocblas)
 add_subdirectory(Rocin)

diff --git a/Roccom/Rocblas/CMakeLists.txt b/Roccom/Rocblas/CMakeLists.txt
@@ -15,6 +15,7 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK )
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 #  IF(MPI_CXX_COMPILER)
 #    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
 #  ENDIF(MPI_CXX_COMPILER)
@@ -27,7 +28,7 @@ find_library(DL_LIB dl)
 set (BLASLIB_SRCS src/Rocblas.C src/axpy.C src/dots.C src/op2args.C src/op3args.C)
 set (ALL_BLAS_SRCS "${BLASLIB_SRCS}")
 set (TEST_SRCS test/blastest.C)
-set_source_files_properties(${ALL_BLAS_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC" )
+set_source_files_properties(${ALL_BLAS_SRCS} ${TEST_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC ${MPI_CXX_COMPILE_FLAGS}" )
 #set(TEST_SRCS src/COMTest.C)
 
 # rpath settings
@@ -42,10 +43,14 @@ ELSE()
   add_library(Rocblas STATIC ${LIB_SRCS})
   add_definitions( -DSTATIC_LINK )
 ENDIF()
-target_link_libraries(Rocblas Roccom)
+target_link_libraries(Rocblas Roccom ${MPI_CXX_LIBRARIES})
 
 add_executable(blastest ${TEST_SRCS})
-target_link_libraries(blastest Rocblas)
+target_link_libraries(blastest Rocblas ${MPI_CXX_LIBRARIES})
+
+IF(MPI_LINK_FLAGS)
+  SET_TARGET_PROPERTIES(Rocblas blastest PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+ENDIF()
 
 #ADD_TEST(RunAllTests ${EXECUTABLE_OUTPUT_PATH}/testx testresults.txt)
 #ADD_TEST(TestObject:ValidHandle ${TEST_RESULTS} TestObject:ValidHandle testresults.txt)

diff --git a/Roccom/Rocin/CMakeLists.txt b/Roccom/Rocin/CMakeLists.txt
@@ -17,9 +17,7 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK )
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 ENDIF()
 IF(ENABLE_CGNS)
   add_definitions ( -DUSE_CGNS )
@@ -56,7 +54,7 @@ ENDIF()
 set (ALL_SRCS "${ROCIN_SRCS} ${TEST_SRCS} ${UTIL_SRCS} ${RHDF4_SRCS}")
 set(LIB_SRCS ${ROCIN_SRCS})
 #set (TEST_SRCS test/maptest.C)
-set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC" )
+set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC ${MPI_CXX_COMPILE_FLAGS}" )
 #set(TEST_SRCS src/COMTest.C)
 
 # rpath settings
@@ -82,6 +80,7 @@ target_link_libraries(Rocin Roccom)
 IF(USE_PTHREADS)
   target_link_libraries(Rocin PTHREAD_LIB)
 ENDIF()
+target_link_libraries(Rocin ${MPI_CXX_LIBRARIES})
 
 # Test executables
 add_executable(intest1 test/intest1.C)
@@ -106,6 +105,10 @@ add_executable(sepin util/sepin.C)
 target_link_libraries(sepin Rocin)
 add_executable(plagprep util/plagprep.C)
 target_link_libraries(plagprep Rocin)
+IF(MPI_LINK_FLAGS)
+  SET_TARGET_PROPERTIES(Rocin intest1 intest2 printin param_test hdf2plt printfeas hdf2vtk sepin plagprep PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+ENDIF()
+
 
 #ADD_TEST(RunAllTests ${EXECUTABLE_OUTPUT_PATH}/testx testresults.txt)
 #ADD_TEST(TestObject:ValidHandle ${TEST_RESULTS} TestObject:ValidHandle testresults.txt)

diff --git a/Roccom/Rocmap/CMakeLists.txt b/Roccom/Rocmap/CMakeLists.txt
@@ -15,9 +15,7 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK )
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 ENDIF()
 
 #INCLUDE(CTest)
@@ -32,7 +30,7 @@ set (UTIL_SRCS util/addpconn.C)
 set (ALL_MAP_SRCS "${MAPLIB_SRCS} ${UTIL_SRCS}")
 
 #set (TEST_SRCS test/maptest.C)
-set_source_files_properties(${ALL_MAP_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC" )
+set_source_files_properties(${ALL_MAP_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC ${MPI_CXX_COMPILE_FLAGS}" )
 #set(TEST_SRCS src/COMTest.C)
 
 # rpath settings
@@ -47,7 +45,7 @@ ELSE()
   add_library(Rocmap STATIC ${LIB_SRCS})
   add_definitions( -DSTATIC_LINK )
 ENDIF()
-target_link_libraries(Rocmap Rocin Rocout Roccom)
+target_link_libraries(Rocmap Rocin Rocout Roccom ${MPI_CXX_LIBRARIES})
 
 add_executable(pconntest test/pconntest.C)
 target_link_libraries(pconntest Rocmap)
@@ -63,6 +61,12 @@ add_executable(bordertest_struc test/bordertest_struc.C)
 target_link_libraries(bordertest_struc Rocmap)
 add_executable(addpconn util/addpconn.C)
 target_link_libraries(addpconn Rocmap)
+
+IF(MPI_LINK_FLAGS)
+  SET_TARGET_PROPERTIES(Rocmap pconntest pcommtest pcommpartest bordertest_hex bordertestg_hex
+    bordertest_struc addpconn PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+ENDIF()
+
 #ADD_TEST(RunAllTests ${EXECUTABLE_OUTPUT_PATH}/testx testresults.txt)
 #ADD_TEST(TestObject:ValidHandle ${TEST_RESULTS} TestObject:ValidHandle testresults.txt)
 #ADD_TEST(TestObject:Exists ${TEST_RESULTS} TestObject:Exists testresults.txt)

diff --git a/Roccom/Rocout/CMakeLists.txt b/Roccom/Rocout/CMakeLists.txt
@@ -14,9 +14,7 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK )
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 ENDIF()
 IF(ENABLE_CGNS)
   add_definitions ( -DUSE_CGNS )
@@ -50,7 +48,7 @@ set (UTIL_SRCS util/ghostbuster.C)
 set (ALL_SRCS "${ROCOUT_SRCS} ${TEST_SRCS} ${UTIL_SRCS}")
 set(LIB_SRCS ${ROCOUT_SRCS})
 #set (TEST_SRCS test/maptest.C)
-set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC" )
+set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC ${MPI_CXX_COMPILE_FLAGS}" )
 #set(TEST_SRCS src/COMTest.C)
 
 # rpath settings
@@ -74,12 +72,16 @@ ENDIF()
 #IF(USE_PTHREADS)
 #  target_link_libraries(Rocout PTHREAD_LIB)
 #ENDIF()
-target_link_libraries(Rocout Rocin)
+target_link_libraries(Rocout Rocin ${MPI_CXX_LIBRARIES})
 
 
 # Test executables
 add_executable(outtest test/outtest.C)
-target_link_libraries(outtest Rocout)
+target_link_libraries(outtest Rocout ${MPI_CXX_LIBRARIES})
+
+IF(MPI_LINK_FLAGS)
+  SET_TARGET_PROPERTIES(Rocout outtest PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+ENDIF()
 #add_executable(inouttest test/inouttest.C)
 #target_link_libraries(inouttest Rocout)
 #add_executable(param_outtest test/param_outtest.C)
@@ -88,7 +90,10 @@ target_link_libraries(outtest Rocout)
 # Utilities
 IF(USE_CGNS)
   add_executable(ghostbuster util/ghostbuster.C)
-  target_link_libraries(ghostbuster Rocout)
+  target_link_libraries(ghostbuster Rocout ${MPI_CXX_LIBRARIES})
+  IF(MPI_LINK_FLAGS)
+    SET_TARGET_PROPERTIES(ghostbuster PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+  ENDIF()
 ENDIF()
 
 #ADD_TEST(RunAllTests ${EXECUTABLE_OUTPUT_PATH}/testx testresults.txt)

diff --git a/Roccom/Rocsurf/CMakeLists.txt b/Roccom/Rocsurf/CMakeLists.txt
@@ -13,9 +13,7 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK )
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 ENDIF()
 
 #INCLUDE(CTest)
@@ -29,7 +27,7 @@ set (TEST_SRCS test/surfmap.C test/surftest1.C test/surftest2.C test/imtest.C te
 set (ALL_SURF_SRCS "${SURFLIB_SRCS} ${TEST_SRCS}")
 
 #set (TEST_SRCS test/surftest.C)
-set_source_files_properties(${ALL_SURF_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC" )
+set_source_files_properties(${ALL_SURF_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC ${MPI_CXX_COMPILE_FLAGS}" )
 #set(TEST_SRCS src/COMTest.C)
 
 # rpath settings
@@ -44,33 +42,35 @@ ELSE()
   add_library(Rocsurf STATIC ${LIB_SRCS})
   add_definitions( -DSTATIC_LINK )
 ENDIF()
-target_link_libraries(Rocsurf Rocmap Rocblas Rocout)
-
-set (TEST_SRCS test/surfmap.C test/surftest1.C test/surftest2.C test/imtest.C test/im2hdf.C test/smf2hdf.C test/neu2hdf.C
-     test/mcntest.C test/obj2hdf.C test/msh2hdf.C test/serialize.C)
+target_link_libraries(Rocsurf Rocmap Rocblas Rocout ${MPI_CXX_LIBRARIES})
 
 add_executable(surfmap test/surfmap.C)
-target_link_libraries(surfmap Rocsurf)
+target_link_libraries(surfmap Rocsurf ${MPI_CXX_LIBRARIES} )
 add_executable(surftest1 test/surftest1.C)
-target_link_libraries(surftest1 Rocsurf)
+target_link_libraries(surftest1 Rocsurf ${MPI_CXX_LIBRARIES})
 add_executable(surftest2 test/surftest2.C)
-target_link_libraries(surftest2 Rocsurf)
+target_link_libraries(surftest2 Rocsurf ${MPI_CXX_LIBRARIES})
 add_executable(imtest test/imtest.C)
-target_link_libraries(imtest Rocsurf)
+target_link_libraries(imtest Rocsurf ${MPI_CXX_LIBRARIES})
 add_executable(im2hdf test/im2hdf.C)
-target_link_libraries(im2hdf Rocsurf)
+target_link_libraries(im2hdf Rocsurf ${MPI_CXX_LIBRARIES})
 add_executable(smf2hdf test/smf2hdf.C)
-target_link_libraries(smf2hdf Rocsurf)
+target_link_libraries(smf2hdf Rocsurf ${MPI_CXX_LIBRARIES})
 add_executable(neu2hdf test/neu2hdf.C)
-target_link_libraries(neu2hdf Rocsurf)
+target_link_libraries(neu2hdf Rocsurf ${MPI_CXX_LIBRARIES})
 add_executable(mcntest test/mcntest.C)
-target_link_libraries(mcntest Rocsurf)
+target_link_libraries(mcntest Rocsurf ${MPI_CXX_LIBRARIES})
 add_executable(obj2hdf test/obj2hdf.C)
-target_link_libraries(obj2hdf Rocsurf)
+target_link_libraries(obj2hdf Rocsurf ${MPI_CXX_LIBRARIES})
 add_executable(msh2hdf test/msh2hdf.C)
-target_link_libraries(msh2hdf Rocsurf)
+target_link_libraries(msh2hdf Rocsurf ${MPI_CXX_LIBRARIES})
 add_executable(serialize test/serialize.C)
-target_link_libraries(serialize Rocsurf)
+target_link_libraries(serialize Rocsurf ${MPI_CXX_LIBRARIES})
+
+IF(MPI_LINK_FLAGS)
+  SET_TARGET_PROPERTIES(Rocsurf surfmap surftest1 surftest2 imtest im2hdf
+    smf2hdf neu2hdf mcntest obj2hdf msh2hdf serialize PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+ENDIF()
 
 #ADD_TEST(RunAllTests ${EXECUTABLE_OUTPUT_PATH}/testx testresults.txt)
 #ADD_TEST(TestObject:ValidHandle ${TEST_RESULTS} TestObject:ValidHandle testresults.txt)