diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-02-18 09:37:56 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-02-18 09:37:56 +0000 |
| commit | 258ea460177a77c5d2cb45d623400cef2f7e0833 (patch) | |
| tree | d2020aad63c0136402813a1197047d71164aec78 /data | |
| parent | 4bae7fba52dbb84bca82cdb247f7e26232ce598f (diff) | |
| parent | abb3faa7088cd6e59f769f2f3b31ecd1b3b0fc0e (diff) | |
Merge of Win64_Boost_Xunit_fix branch:
include CGAL_USE_FILE on CMakeLists.txt top
compilation flags review
Win64 compilation fix
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1029 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 5a4cfa92100015756417c9e90140af9590d61bfd
Diffstat (limited to 'data')
| -rw-r--r-- | data/points/generator/CMakeLists.txt | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/data/points/generator/CMakeLists.txt b/data/points/generator/CMakeLists.txt index 26b44446..c01a380d 100644 --- a/data/points/generator/CMakeLists.txt +++ b/data/points/generator/CMakeLists.txt @@ -5,22 +5,6 @@ if(CGAL_FOUND) if (NOT CGAL_VERSION VERSION_LESS 4.6.0) message(STATUS "CGAL version: ${CGAL_VERSION}.") - include( ${CGAL_USE_FILE} ) - # In CMakeLists.txt, when include(${CGAL_USE_FILE}), CXX_FLAGS are overwritten. - # cf. http://doc.cgal.org/latest/Manual/installation.html#title40 - # A workaround is to add "-std=c++11" again. - # A fix would be to use https://cmake.org/cmake/help/v3.1/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.html - # or even better https://cmake.org/cmake/help/v3.1/variable/CMAKE_CXX_STANDARD.html - # but it implies to use cmake version 3.1 at least. - if(NOT MSVC) - include(CheckCXXCompilerFlag) - CHECK_CXX_COMPILER_FLAG(-std=c++11 COMPILER_SUPPORTS_CXX11) - if(COMPILER_SUPPORTS_CXX11) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() - endif() - # - End of workaround - find_package(Eigen3 3.1.0) if (EIGEN3_FOUND) include( ${EIGEN3_USE_FILE} ) |