diff options
author | Marc Glisse <marc.glisse@inria.fr> | 2019-11-08 21:05:19 +0100 |
---|---|---|
committer | Marc Glisse <marc.glisse@inria.fr> | 2019-11-08 21:05:19 +0100 |
commit | 60c52012578265e6b6ac2e4a616cf2b617809d2c (patch) | |
tree | e958905af656f72228f9e778464739093635d35b /src/cmake | |
parent | 7c80dd28eb16e70316e6acc0bde8f698f79b2003 (diff) | |
parent | db405e686cc859e510b894dca45562158cb5c963 (diff) |
Merge remote-tracking branch 'origin/master' into sklearn_tda
Diffstat (limited to 'src/cmake')
-rw-r--r-- | src/cmake/modules/GUDHI_compilation_flags.cmake | 2 | ||||
-rw-r--r-- | src/cmake/modules/GUDHI_third_party_libraries.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/cmake/modules/GUDHI_compilation_flags.cmake b/src/cmake/modules/GUDHI_compilation_flags.cmake index 86cd531b..6cd2614d 100644 --- a/src/cmake/modules/GUDHI_compilation_flags.cmake +++ b/src/cmake/modules/GUDHI_compilation_flags.cmake @@ -38,7 +38,7 @@ function(can_cgal_use_cxx11_thread_local) check_cxx_source_compiles("${CGAL_CAN_USE_CXX11_THREAD_LOCAL}" CGAL_CAN_USE_CXX11_THREAD_LOCAL_RESULT) endfunction() -set (CMAKE_CXX_STANDARD 11) +set (CMAKE_CXX_STANDARD 14) enable_testing() diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake index d053e94f..24a34150 100644 --- a/src/cmake/modules/GUDHI_third_party_libraries.cmake +++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake @@ -126,6 +126,7 @@ if( PYTHONINTERP_FOUND ) find_python_module("scipy") find_python_module("sphinx") find_python_module("sklearn") + find_python_module("ot") endif() if(NOT GUDHI_PYTHON_PATH) |