Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Stockner <lukas.stockner@freenet.de>2017-02-01 20:07:35 +0300
committerLukas Stockner <lukas.stockner@freenet.de>2017-02-01 20:07:35 +0300
commit71e1c3bc4b89a5b436f2b864ffb24150b29d74a0 (patch)
tree717cf0848fa0f80bbb651bf04c6e04d9c7077e1a /CMakeLists.txt
parent671a28ae55235beabc579cf3e02439e07d661212 (diff)
parentfa19940dc63d22cc03e1411e2add8ec8647b5f28 (diff)
Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d61a7de1a33..7b98fe4ad73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -727,7 +727,7 @@ if(NOT WITH_BOOST)
macro(set_and_warn
_setting _val)
if(${${_setting}})
- message(STATUS "'WITH_BOOST' is disabled: forceing 'set(${_setting} ${_val})'")
+ message(STATUS "'WITH_BOOST' is disabled: forcing 'set(${_setting} ${_val})'")
endif()
set(${_setting} ${_val})
endmacro()