diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 16ac322ebdd..cddb93dd7ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -263,6 +263,8 @@ endif() option(WITH_HEADLESS "Build without graphical support (renderfarm, server mode only)" OFF) mark_as_advanced(WITH_HEADLESS) +option(WITH_QUADRIFLOW "Build with quadriflow remesher support" ON) + option(WITH_AUDASPACE "Build with blenders audio library (only disable if you know what you're doing!)" ON) option(WITH_SYSTEM_AUDASPACE "Build with external audaspace library installed on the system (only enable if you know what you're doing!)" OFF) mark_as_advanced(WITH_AUDASPACE) @@ -424,6 +426,7 @@ mark_as_advanced(WITH_CYCLES_DEBUG) mark_as_advanced(WITH_CYCLES_NATIVE_ONLY) option(WITH_CYCLES_DEVICE_CUDA "Enable Cycles CUDA compute support" ON) +option(WITH_CYCLES_DEVICE_OPTIX "Enable Cycles OptiX support" OFF) option(WITH_CYCLES_DEVICE_OPENCL "Enable Cycles OpenCL compute support" ON) option(WITH_CYCLES_NETWORK "Enable Cycles compute over network support (EXPERIMENTAL and unfinished)" OFF) mark_as_advanced(WITH_CYCLES_DEVICE_CUDA) @@ -673,6 +676,7 @@ if(NOT WITH_BOOST) set_and_warn(WITH_INTERNATIONAL OFF) set_and_warn(WITH_OPENVDB OFF) set_and_warn(WITH_OPENCOLORIO OFF) + set_and_warn(WITH_QUADRIFLOW OFF) elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_INTERNATIONAL OR WITH_OPENVDB OR WITH_OPENCOLORIO) # Keep enabled @@ -752,14 +756,12 @@ if(NOT WITH_CUDA_DYNLOAD) endif() #----------------------------------------------------------------------------- -# Check for valid directories -# ... a partial checkout may cause this. -# -# note: we need to check for a known subdir in both cases. -# since uninitialized git submodules will give blank dirs +# Check check if submodules are cloned if(WITH_INTERNATIONAL) - if(NOT EXISTS "${CMAKE_SOURCE_DIR}/release/datafiles/locale/languages") + file(GLOB RESULT "${CMAKE_SOURCE_DIR}/release/datafiles/locale") + list(LENGTH RESULT DIR_LEN) + if(DIR_LEN EQUAL 0) message(WARNING "Translation path '${CMAKE_SOURCE_DIR}/release/datafiles/locale' is missing, " "This is a 'git submodule', which are known not to work with bridges to other version " @@ -781,7 +783,9 @@ if(WITH_PYTHON) message(FATAL_ERROR "At least Python 3.7 is required to build") endif() - if(NOT EXISTS "${CMAKE_SOURCE_DIR}/release/scripts/addons/modules") + file(GLOB RESULT "${CMAKE_SOURCE_DIR}/release/scripts/addons") + list(LENGTH RESULT DIR_LEN) + if(DIR_LEN EQUAL 0) message(WARNING "Addons path '${CMAKE_SOURCE_DIR}/release/scripts/addons' is missing, " "This is a 'git submodule', which are known not to work with bridges to other version " @@ -1430,7 +1434,6 @@ if(CMAKE_COMPILER_IS_GNUCC) ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_DIV_BY_ZERO -Wno-div-by-zero) ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_TYPE_LIMITS -Wtype-limits) ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ERROR_RETURN_TYPE -Werror=return-type) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION -Werror=implicit-function-declaration) ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts) ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas) ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_POINTER_ARITH -Wpointer-arith) @@ -1607,15 +1610,19 @@ if(WITH_PYTHON) endif() endif() -if( +if(MSVC) + # MSVC needs to be tested first, since clang on windows will + # match the compiler test below but clang-cl does not accept -std=c++11 + # since it is on by default and cannot be turned off. + # + # Nothing special is needed, C++11 features are available by default. +elseif( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID MATCHES "Intel" ) # TODO(sergey): Do we want c++11 or gnu-c++11 here? set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -elseif(MSVC) - # Nothing special is needed, C++11 features are available by default. else() message(FATAL_ERROR "Unknown compiler ${CMAKE_C_COMPILER_ID}, can't enable C++11 build") endif() @@ -1766,6 +1773,7 @@ if(FIRST_RUN) info_cfg_option(WITH_OPENIMAGEDENOISE) info_cfg_option(WITH_OPENVDB) info_cfg_option(WITH_ALEMBIC) + info_cfg_option(WITH_QUADRIFLOW) info_cfg_text("Compiler Options:") info_cfg_option(WITH_BUILDINFO) |