diff options
| author | Werner, Stefan <stefan.werner@intel.com> | 2022-05-17 08:21:49 +0300 |
|---|---|---|
| committer | Werner, Stefan <stefan.werner@intel.com> | 2022-05-17 08:21:49 +0300 |
| commit | 67da5316f0aef3ae789ec8e474db92898e56ca5c (patch) | |
| tree | e3cb4dd0f007202d2252266455bed8cd21397a55 /CMakeLists.txt | |
| parent | be7a5daa42295572a86c52cacea1576e9fa17be8 (diff) | |
| parent | 1a740c25417f735d6a778e2c6339356d48eed2ea (diff) | |
Merge branch 'master' into cycles_oneapi
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 29ca9caa4b8..51dff4d647e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -799,7 +799,9 @@ set_and_warn_dependency(WITH_BOOST WITH_OPENCOLORIO OFF) set_and_warn_dependency(WITH_BOOST WITH_QUADRIFLOW OFF) set_and_warn_dependency(WITH_BOOST WITH_USD OFF) set_and_warn_dependency(WITH_BOOST WITH_ALEMBIC OFF) -set_and_warn_dependency(WITH_PUGIXML WITH_CYCLES_OSL OFF) +if(WITH_CYCLES) + set_and_warn_dependency(WITH_PUGIXML WITH_CYCLES_OSL OFF) +endif() set_and_warn_dependency(WITH_PUGIXML WITH_OPENIMAGEIO OFF) if(WITH_BOOST AND NOT (WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_INTERNATIONAL OR @@ -1474,14 +1476,6 @@ if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING)) endif() #----------------------------------------------------------------------------- -# Configure Ceres - -if(WITH_LIBMV) - # We always have C++11 which includes unordered_map. - set(CERES_DEFINES "-DCERES_STD_UNORDERED_MAP;-DCERES_USE_CXX_THREADS") -endif() - -#----------------------------------------------------------------------------- # Extra limits to number of jobs running in parallel for some kind os tasks. # Only supported by Ninja build system currently. if("${CMAKE_GENERATOR}" MATCHES "Ninja" AND WITH_NINJA_POOL_JOBS) |