diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 43 |
1 files changed, 12 insertions, 31 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 29ab2a55..6a49185f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ if(MSVC) # Turn off some VC++ warnings SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4668 /wd4311 /wd4800 /wd4820 /wd4503 /wd4244 /wd4345 /wd4996 /wd4396 /wd4018") else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -std=c++11 -Wall -Wsign-compare") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -std=c++11 -Wall -Wpedantic -Wsign-compare") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb -O0") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") endif() @@ -27,10 +27,10 @@ set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_MULTITHREADED ON) set(Boost_USE_STATIC_RUNTIME OFF) -#find_package(GMP) -#if(GMP_FOUND) - #find_package(GMPXX) -#endif() +find_package(GMP) +if(GMP_FOUND) + find_package(GMPXX) +endif() find_package(CGAL) @@ -39,28 +39,16 @@ set(TBB_FIND_QUIETLY ON) find_package(TBB) # Required programs for unitary tests purpose -FIND_PROGRAM( LCOV_PATH lcov ) -if (LCOV_PATH) - message("lcov found in ${LCOV_PATH}") +FIND_PROGRAM( GCOVR_PATH gcovr ) +if (GCOVR_PATH) + message("gcovr found in ${GCOVR_PATH}") endif() - -FIND_PROGRAM( PYTHON_PATH python ) -if (PYTHON_PATH) - message("python found in ${PYTHON_PATH}") +# Required programs for unitary tests purpose +FIND_PROGRAM( GPROF_PATH gprof ) +if (GPROF_PATH) + message("gprof found in ${GPROF_PATH}") endif() -# Function to add_test cpplint on each header file of the Gudhi module -function(cpplint_add_tests the_directory) - if (PYTHON_PATH) - # Cpplint tests on coding style - file(GLOB files "${the_directory}/*.h" "${the_directory}/*/*.h") - foreach(filename ${files}) - message(${filename}) - add_test("${filename}.cpplint" ${CMAKE_SOURCE_DIR}/scripts/check_google_style.sh ${filename} ${CMAKE_SOURCE_DIR}/scripts/cpplint.py) - endforeach() - endif() -endfunction(cpplint_add_tests) - if(NOT Boost_FOUND) message(FATAL_ERROR "NOTICE: This demo requires Boost and will not be compiled.") @@ -92,13 +80,8 @@ else() add_subdirectory(src/Skeleton_blocker/test) add_subdirectory(src/Skeleton_blocker/example) add_subdirectory(src/Contraction/example) - # add_subdirectory(src/Hasse_complex/example) add_subdirectory(src/Witness_complex/test) add_subdirectory(src/Witness_complex/example) - # add_subdirectory(src/Alpha_shapes/example) - # add_subdirectory(src/Alpha_shapes/test) - add_subdirectory(src/Bottleneck/example) - add_subdirectory(src/Bottleneck/test) # data points generator add_subdirectory(data/points/generator) @@ -108,5 +91,3 @@ else() add_subdirectory(src/GudhUI) endif() - - |