diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2016-08-23 18:37:27 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2016-08-23 18:37:27 +0300 |
| commit | 87808023bbf3e78f6e83bcb8f85fabda02dcb4d2 (patch) | |
| tree | 04af9deaa88a7c1afb8c76492204c56d5d7ceab6 /CMakeLists.txt | |
| parent | ac75f262b2097b84b3ad4d3f96660913183cdebc (diff) | |
| parent | 7dc328e8a1cea0f1ea0b8848a38ce7521401ca8b (diff) | |
Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d7a7ac93d2..f264d05fab0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -512,6 +512,10 @@ mark_as_advanced(WITH_CXX11) option(WITH_LEGACY_DEPSGRAPH "Build Blender with legacy dependency graph" ON) mark_as_advanced(WITH_LEGACY_DEPSGRAPH) +# Use hardcoded paths or find_package to find externals +option(WITH_WINDOWS_FIND_MODULES "Use find_package to locate libraries" OFF) +mark_as_advanced(WITH_WINDOWS_FIND_MODULES) + # avoid using again option_defaults_clear() |