diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-30 08:39:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-30 08:39:12 +0300 |
| commit | 5f693d74420d4080f2395e75b36f57d87603bf9f (patch) | |
| tree | 038fbe6daae8a40d2a149fdaf56169f41e4f78a4 | |
| parent | 40ad0de0027dd15934bec4fa79349c4580f83945 (diff) | |
| parent | 9c960557a7d2734b3be8cf5f512ef0d8bba54e98 (diff) | |
Merge branch 'master' into blender2.8
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/blender/compositor/nodes/COM_CryptomatteNode.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d79ab2ed90..f285b31b9d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,6 +62,11 @@ if(NOT DEFINED CMAKE_BUILD_TYPE_INIT) set(CMAKE_BUILD_TYPE_INIT "Release") endif() +# Omit superfluous "Up-to-date" messages. +if(NOT DEFINED CMAKE_INSTALL_MESSAGE) + set(CMAKE_INSTALL_MESSAGE "LAZY") +endif() + # quiet output for Makefiles, 'make -s' helps too # set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.h b/source/blender/compositor/nodes/COM_CryptomatteNode.h index 5251b57d8af..0ee3c1740b3 100644 --- a/source/blender/compositor/nodes/COM_CryptomatteNode.h +++ b/source/blender/compositor/nodes/COM_CryptomatteNode.h @@ -35,4 +35,3 @@ public: }; #endif - |