Merge pull request #4 from torbjoernk/feature/cmake

enabled CMake for examples

Author: memmett

.travis.yml

@@ -26,7 +26,7 @@ before_script:
 script:
   - mkdir build
   - cd build
-  - cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -Dpfasst_DISABLE_LIBCXX=ON -Dpfasst_BUILD_TESTS=ON ..
+  - cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -Dpfasst_DISABLE_LIBCXX=ON -Dpfasst_BUILD_TESTS=ON -Dpfasst_BUILD_EXAMPLES=ON ..
   - make
   - make test
 

3rdparty/CMakeLists.txt

@@ -1,10 +1,42 @@
 # Managing 3rd-party libraries and tools
 set(3rdparty_INCLUDES ${3rdparty_INCLUDES})
 set(3rdparty_DEPENDEND_LIBS ${3rdparty_DEPENDEND_LIBS})
+message(STATUS "--------------------------------------------------------------------------------")
+
+if(pfasst_BUILD_EXAMPLES)
+    message(STATUS "FFTW3")
+    set(fftw3_SOURCE_DIR "${pfasst_BINARY_DIR}/3rdparty/src/fftw3")
+    set(fftw3_INSTALL_DIR "${pfasst_BINARY_DIR}/3rdparty/src/fftw3-install")
+    
+    ExternalProject_Add(
+        fftw3
+        LIST_SEPARATOR " "
+        URL http://fftw.org/fftw-3.3.4.tar.gz
+        URL_MD5 2edab8c06b24feeb3b82bbb3ebf3e7b3
+        TIMEOUT 10
+        UPDATE_COMMAND ""
+        PATCH_COMMAND ""
+        BUILD_IN_SOURCE ON
+        CONFIGURE_COMMAND ${fftw3_SOURCE_DIR}/configure CC=${CMAKE_C_COMPILER} --prefix=${fftw3_INSTALL_DIR} --libdir=${fftw3_INSTALL_DIR}/lib CXX=${CMAKE_CXX_COMPILER}
+        BUILD_COMMAND make
+        TEST_COMMAND ""
+        INSTALL_DIR ${fftw3_SOURCE_DIR}-install
+        INSTALL_COMMAND make install
+        LOG_DOWNLOAD ON
+        LOG_CONFIGURE ON
+        LOG_BUILD ON
+    )
+    # Specify include dir
+    set(fftw3_INCLUDES ${fftw3_INSTALL_DIR}/include PARENT_SCOPE)
+    set(fftw3_LIBS ${fftw3_INSTALL_DIR}/lib/libfftw3.a PARENT_SCOPE)
+
+    if(pfasst_BUILD_TESTS)
+        message(STATUS "--------------------------------------------------------------------------------")
+    endif()
+endif()
 
 if(pfasst_BUILD_TESTS)
-    message(STATUS "3rd party: Google Testing Framework (gtest & gmock)")
-    message(STATUS "--------------------------------------------------------------------------------")
+    message(STATUS "Google Testing Framework (gtest & gmock)")
 
     # Add gmock
     ExternalProject_Add(
@@ -17,7 +49,6 @@ if(pfasst_BUILD_TESTS)
       PATCH_COMMAND ""
       CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release
       -Dgtest_force_shared_crt=ON
-      -DCMAKE_VERBOSE_MAKEFILE=ON
       -Dgmock_build_tests=${gtest_BUILD_TESTS}
       # Disable install step
       INSTALL_COMMAND ""
@@ -37,8 +68,6 @@ if(pfasst_BUILD_TESTS)
 
     list(APPEND 3rdparty_DEPENDEND_LIBS ${binary_dir}/${CMAKE_FIND_LIBRARY_PREFIXES}gmock${Suffix})
     list(APPEND 3rdparty_DEPENDEND_LIBS ${Pthread})
-
-    message(STATUS "--------------------------------------------------------------------------------")
 endif()
 
 # propagate include lists to parent directory

CMakeLists.txt

@@ -11,10 +11,10 @@ include(ExternalProject)
 set_directory_properties(PROPERTIES EP_PREFIX ${CMAKE_BINARY_DIR}/3rdparty)
 
 option(pfasst_DISABLE_LIBCXX "Disable use of LLVM's libstdc++ when compiling with Clang." ON)
+option(pfasst_BUILD_EXAMPLES "Build example programs." ON)
 option(pfasst_BUILD_TESTS "Build test suite for PFASST." ON)
 
 # check for C++11 support
-message(STATUS "Testing Compiler for C++11 Support ...")
 if(${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
     check_cxx_compiler_flag(-std=c++11 HAVE_STD11)
     if(HAVE_STD11)
@@ -55,12 +55,21 @@ endif(pfasst_BUILD_TESTS)
 # adding / including 3rd-party libraries
 message(STATUS "********************************************************************************")
 message(STATUS "Configuring 3rd party libraries")
+# makes available:
+#  - fftw3_INCLUDES  (if pfasst_BUILD_EXAMPLES)
+#  - fftw3_LIBS      (if pfasst_BUILD_EXAMPLES)
 add_subdirectory(3rdparty)
 
 message(STATUS "********************************************************************************")
 message(STATUS "Configuring sources")
 add_subdirectory(src)
 
+if(pfasst_BUILD_EXAMPLES)
+    message(STATUS "********************************************************************************")
+    message(STATUS "Configuring examples")
+    add_subdirectory(examples)
+endif()
+
 if(pfasst_BUILD_TESTS)
     message(STATUS "********************************************************************************")
     message(STATUS "Configuring tests")
@@ -71,5 +80,3 @@ message(STATUS "****************************************************************
 message(STATUS "C++ Compiler ID: ${CMAKE_CXX_COMPILER_ID}")
 message(STATUS "C++ Flags: ${CMAKE_CXX_FLAGS}")
 message(STATUS "C++ link flags: ${CMAKE_CXX_LINK_FLAGS}")
-
-set(CMAKE_VERBOSE_MAKEFILE ON)

examples/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(ad)

examples/ad/CMakeLists.txt

@@ -0,0 +1,18 @@
+message(STATUS "  advection")
+include_directories(
+    ${fftw3_INCLUDES}
+    ${pfasst_INCLUDES}
+)
+
+set(advection_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+)
+
+add_executable(advection ${advection_SOURCES})
+add_dependencies(advection fftw3)
+target_link_libraries(advection
+    ${fftw3_LIBS}
+)
+set_target_properties(advection
+    PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${pfasst_BINARY_DIR}/examples
+)

tests/CMakeLists.txt

@@ -9,6 +9,7 @@ set(TESTS
 )
 
 foreach(test ${TESTS})
+    message(STATUS "  ${test}")
     add_executable(${test} ${test}.cpp)
     add_dependencies(${test} googlemock)
     target_link_libraries(${test}