cmake polish

Author: Ithanil

.gitignore

@@ -62,11 +62,8 @@ DerivedData
 lib*
 build
 config.sh
-*exe*
 vgcore*
 
-test/*.txt
-
 doc/*.aux
 doc/*.dvi
 doc/*.idx

CMakeLists.txt

@@ -12,12 +12,15 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${USER_CXX_FLAGS}")
 message(STATUS "Configured CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
 
 find_package(MPI)
-message(STATUS "MPI_INCLUDE_PATH: ${MPI_INCLUDE_PATH}")
-message(STATUS "MPI_CXX_LIBRARIES: ${MPI_CXX_LIBRARIES}")
+if (MPI_FOUND)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_MPI=1")
+  include_directories(SYSTEM ${MPI_INCLUDE_PATH})
+  message(STATUS "MPI_INCLUDE_PATH: ${MPI_INCLUDE_PATH}")
+  message(STATUS "MPI_CXX_LIBRARIES: ${MPI_CXX_LIBRARIES}")
+endif()
 
 # set header / library paths
 include_directories(include/) # headers
-include_directories(SYSTEM ${MPI_INCLUDE_PATH})
 
 enable_testing()
 

config_template.sh

@@ -1,11 +1,8 @@
 #!/bin/bash
 
 # C++ flags
-CXX_FLAGS="-O3 -flto -Wall"
+CXX_FLAGS="-O3 -flto -Wall -Wno-unused-function"
 
 # currently unused:
 # C++ compiler
-#CC="g++"
-# MPI compiler wrapper
-#MPICC="mpic++"
-
+# CXX="g++"

examples/CMakeLists.txt

@@ -1,4 +1,6 @@
 link_libraries(mci)
 add_executable(ex1.exe ex1/main.cpp)
-add_executable(ex2.exe ex2/main.cpp)
-target_link_libraries(ex2.exe ${MPI_CXX_LIBRARIES})
+if (MPI_FOUND)
+  add_executable(ex2.exe ex2/main.cpp)
+  target_link_libraries(ex2.exe ${MPI_CXX_LIBRARIES})
+endif()

include/mci/MPIMCI.hpp

@@ -1,3 +1,5 @@
+#if USE_MPI==1
+
 #ifndef MPIMCI
 #define MPIMCI
 
@@ -124,3 +126,5 @@ namespace MPIMCI
 };
 
 #endif
+
+#endif

src/CMakeLists.txt

@@ -1,2 +1,8 @@
 file(GLOB SOURCES "*.cpp")
-add_library(mci STATIC ${SOURCES})
+add_library(mci SHARED ${SOURCES})
+add_library(mci_static STATIC ${SOURCES})
+
+if (MPI_FOUND)
+  target_link_libraries(mci ${MPI_CXX_LIBRARIES})
+  target_link_libraries(mci_static ${MPI_CXX_LIBRARIES})
+endif()

test/run.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+VALGRIND="valgrind --leak-check=full --track-origins=yes"
+
+ORIGDIR=$(pwd)
+cd ../build/test/
+${VALGRIND} ./check
+for exe in ./ut*.exe; do
+    echo
+    echo "Running test ${exe}..."
+    ${VALGRIND} ${exe}
+    echo
+done
+cd ${ORIGDIR}