diff options
author | Ray Molenkamp <github@lazydodo.com> | 2020-08-26 19:04:24 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2020-08-26 19:04:24 +0300 |
commit | b028a43245afeb73ca1b35a3698fbbd329d1f100 (patch) | |
tree | 291561de9c88c1c183d23aa83292e846e11f5117 /extern/quadriflow/CMakeLists.txt | |
parent | 3185e17844caa72d2922994a16f0f50333adbbc8 (diff) |
Cleanup:Remove C++14 flags from extern/quadriflow
The main CMakeLists.txt specifies C++17, quadriflow tries to add C++14
flags leading to the following warnings when building with MSVC
Command line warning D9025 : overriding '/std:c++17' with '/std:c++14`
This change removes the C++14 flags, and fixes a build error caused
by the removal of `std::unary_function` in C++17 in the .obj loader
(which isn't used by blender)
Reviewed By: zeddb
Differential Revision: https://developer.blender.org/D8720
Diffstat (limited to 'extern/quadriflow/CMakeLists.txt')
-rw-r--r-- | extern/quadriflow/CMakeLists.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/extern/quadriflow/CMakeLists.txt b/extern/quadriflow/CMakeLists.txt index bf64e5edb67..e24151d8bf6 100644 --- a/extern/quadriflow/CMakeLists.txt +++ b/extern/quadriflow/CMakeLists.txt @@ -28,9 +28,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") ) endif() -set(CMAKE_CXX_STANDARD 14) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - if(WIN32) add_definitions(-D_USE_MATH_DEFINES) endif() |