diff options
| author | Hind-M <hind.montassif@gmail.com> | 2022-05-02 12:03:52 +0200 |
|---|---|---|
| committer | Hind-M <hind.montassif@gmail.com> | 2022-05-02 12:03:52 +0200 |
| commit | 996c0669ac92ec98576c7a0dae2358dc0d4bc2c9 (patch) | |
| tree | 72c5185906651bee4a92a93bdae21d7848c56ebd /src/cmake | |
| parent | 0047eaacaffef2b3da6207123da3ef3d919c0b27 (diff) | |
| parent | 5857c571388a4349934a266ca187b2c2ac10818c (diff) | |
Merge remote-tracking branch 'upstream/master' into fetch_datasets
Diffstat (limited to 'src/cmake')
| -rw-r--r-- | src/cmake/modules/GUDHI_third_party_libraries.cmake | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake index b316740d..6a94d1f5 100644 --- a/src/cmake/modules/GUDHI_third_party_libraries.cmake +++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake @@ -1,12 +1,14 @@ # This files manage third party libraries required by GUDHI -find_package(Boost 1.56.0 QUIET OPTIONAL_COMPONENTS filesystem unit_test_framework program_options) +find_package(Boost 1.66.0 QUIET OPTIONAL_COMPONENTS filesystem unit_test_framework program_options) # Boost_FOUND is not reliable if(NOT Boost_VERSION) message(FATAL_ERROR "NOTICE: This program requires Boost and will not be compiled.") endif(NOT Boost_VERSION) include_directories(${Boost_INCLUDE_DIRS}) +message(STATUS "boost include dirs:" ${Boost_INCLUDE_DIRS}) +message(STATUS "boost library dirs:" ${Boost_LIBRARY_DIRS}) find_package(GMP) if(GMP_FOUND) @@ -17,6 +19,15 @@ if(GMP_FOUND) endif() endif() +# from windows vcpkg eigen 3.4.0#2 : build fails with +# error C2440: '<function-style-cast>': cannot convert from 'Eigen::EigenBase<Derived>::Index' to '__gmp_expr<mpq_t,mpq_t>' +# cf. https://gitlab.com/libeigen/eigen/-/issues/2476 +# Workaround is to compile with '-DEIGEN_DEFAULT_DENSE_INDEX_TYPE=int' +if (FORCE_EIGEN_DEFAULT_DENSE_INDEX_TYPE_TO_INT) + message("++ User explicit demand to force EIGEN_DEFAULT_DENSE_INDEX_TYPE to int") + add_definitions(-DEIGEN_DEFAULT_DENSE_INDEX_TYPE=int) +endif() + # In CMakeLists.txt, when include(${CGAL_USE_FILE}), CMAKE_CXX_FLAGS are overwritten. # cf. http://doc.cgal.org/latest/Manual/installation.html#title40 # A workaround is to include(${CGAL_USE_FILE}) before adding "-std=c++11". @@ -90,9 +101,6 @@ add_definitions( -DBOOST_ALL_DYN_LINK ) # problem on Mac with boost_system and boost_thread add_definitions( -DBOOST_SYSTEM_NO_DEPRECATED ) -message(STATUS "boost include dirs:" ${Boost_INCLUDE_DIRS}) -message(STATUS "boost library dirs:" ${Boost_LIBRARY_DIRS}) - if (WITH_GUDHI_PYTHON) # Find the correct Python interpreter. # Can be set with -DPYTHON_EXECUTABLE=/usr/bin/python3 or -DPython_ADDITIONAL_VERSIONS=3 for instance. @@ -181,4 +189,4 @@ if (WITH_GUDHI_PYTHON) endif(NOT SPHINX_PATH) endif(SPHINX_FOUND) endif(PYTHONINTERP_FOUND AND CYTHON_FOUND) -endif (WITH_GUDHI_PYTHON)
\ No newline at end of file +endif (WITH_GUDHI_PYTHON) |