summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2021-10-08 09:12:18 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2021-10-08 09:12:18 +0900
commita1783a4c18042c7d94afe9e939b9c1569f176bb4 (patch)
tree79d03064745b8c2b52051bf89ac876fb54bc6647
parent915c76ded744c0f5f151402b9fa69f3fd8452573 (diff)
downloadcmake-a1783a4c18042c7d94afe9e939b9c1569f176bb4.tar.gz
cmake-a1783a4c18042c7d94afe9e939b9c1569f176bb4.tar.bz2
cmake-a1783a4c18042c7d94afe9e939b9c1569f176bb4.zip
Imported Upstream version 3.9.5upstream/3.9.5
-rw-r--r--Source/CMakeVersion.cmake2
-rw-r--r--Source/cmQtAutoGenerators.cxx3
2 files changed, 1 insertions, 4 deletions
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index ecf511607..cf7efe09d 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
# CMake version number components.
set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 9)
-set(CMake_VERSION_PATCH 4)
+set(CMake_VERSION_PATCH 5)
#set(CMake_VERSION_RC 0)
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index d12d96dcb..c3ecb51b8 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1268,9 +1268,6 @@ bool cmQtAutoGenerators::MocGenerateAll(
it != this->MocDefinitions.end(); ++it) {
cmd.push_back("-D" + (*it));
}
- // Add options
- cmd.insert(cmd.end(), this->MocOptions.begin(),
- this->MocOptions.end());
// Execute command
if (!this->RunCommand(cmd, output, false)) {
{