diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cd518227e27..76d2d578dc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,6 +102,11 @@ if(POLICY CMP0068) cmake_policy(SET CMP0068 NEW) endif() +# find_package() uses <PackageName>_ROOT variables. +if(POLICY CMP0074) + cmake_policy(SET CMP0074 NEW) +endif() + #----------------------------------------------------------------------------- # Load some macros. include(build_files/cmake/macros.cmake) @@ -183,6 +188,7 @@ if(APPLE) else() option(WITH_XR_OPENXR "Enable VR features through the OpenXR specification" ON) endif() +option(WITH_GMP "Enable features depending on GMP (Exact Boolean)" ON) # Compositor option(WITH_COMPOSITOR "Enable the tile based nodal compositor" ON) @@ -430,6 +436,10 @@ if(WIN32) option(WITH_TBB_MALLOC_PROXY "Enable the TBB malloc replacement" ON) endif() +# This should be turned off when Blender enter beta/rc/release +option(WITH_EXPERIMENTAL_FEATURES "Enable experimental features (still need to enable them in the user preferences)" ON) +mark_as_advanced(WITH_EXPERIMENTAL_FEATURES) + # Unit testsing option(WITH_GTESTS "Enable GTest unit testing" OFF) option(WITH_OPENGL_RENDER_TESTS "Enable OpenGL render related unit testing (Experimental)" OFF) @@ -1562,6 +1572,12 @@ endif() if(MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17") + # Make MSVC properly report the value of the __cplusplus preprocessor macro + # Available MSVC 15.7 (1914) and up, without this it reports 199711L regardless + # of the C++ standard chosen above + if(MSVC_VERSION GREATER 1913) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus") + endif() elseif( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang" OR @@ -1724,6 +1740,7 @@ if(FIRST_RUN) info_cfg_option(WITH_QUADRIFLOW) info_cfg_option(WITH_USD) info_cfg_option(WITH_TBB) + info_cfg_option(WITH_GMP) info_cfg_text("Compiler Options:") info_cfg_option(WITH_BUILDINFO) |