diff options
author | Vincent Rouvreau <10407034+VincentRouvreau@users.noreply.github.com> | 2019-09-23 17:12:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-23 17:12:02 +0200 |
commit | 8d4cda83780a0005439f6dcd68318b3ca814a0c1 (patch) | |
tree | 7c7fb38e193da80875a3d85cec029a875c84bd8f /src/python | |
parent | 36d82a6ffe7c099da9241f7268637feaeef6bf55 (diff) | |
parent | 89d678a78dd2bf05ef3d00e889fe0d9c51fb3b32 (diff) |
Merge pull request #93 from VincentRouvreau/cpp14_for_cgal5
C++ 14 is the new standard for the project
Diffstat (limited to 'src/python')
-rw-r--r-- | src/python/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/python/doc/installation.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt index 9e128d30..5508cbc7 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -73,7 +73,7 @@ if(PYTHONINTERP_FOUND) if(MSVC) set(GUDHI_PYTHON_EXTRA_COMPILE_ARGS "${GUDHI_PYTHON_EXTRA_COMPILE_ARGS}'/fp:strict', ") else(MSVC) - set(GUDHI_PYTHON_EXTRA_COMPILE_ARGS "${GUDHI_PYTHON_EXTRA_COMPILE_ARGS}'-std=c++11', ") + set(GUDHI_PYTHON_EXTRA_COMPILE_ARGS "${GUDHI_PYTHON_EXTRA_COMPILE_ARGS}'-std=c++14', ") endif(MSVC) if(CMAKE_COMPILER_IS_GNUCXX) set(GUDHI_PYTHON_EXTRA_COMPILE_ARGS "${GUDHI_PYTHON_EXTRA_COMPILE_ARGS}'-frounding-math', ") diff --git a/src/python/doc/installation.rst b/src/python/doc/installation.rst index 5a6ad9f4..77d9e8b3 100644 --- a/src/python/doc/installation.rst +++ b/src/python/doc/installation.rst @@ -12,7 +12,7 @@ The easiest way to install the Python version of GUDHI is using Compiling ********* -The library uses c++11 and requires `Boost <https://www.boost.org/>`_ ≥ 1.56.0, +The library uses c++14 and requires `Boost <https://www.boost.org/>`_ ≥ 1.56.0, `CMake <https://www.cmake.org/>`_ ≥ 3.1 to generate makefiles, `NumPy <http://numpy.org>`_ and `Cython <https://www.cython.org/>`_ to compile the GUDHI Python module. |