diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-24 12:47:03 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-06-24 12:47:03 (GMT) |
| commit | 0bd82cb1a7be7492df0eb1d9ebb857dc246a0d6d (patch) | |
| tree | c024ce8d7ab0e164674121690fb4848688735cb9 /Source/cmake.cxx | |
| parent | 0fd7d471385f043dbff298d925914f4e6a9fcfbf (diff) | |
| parent | ea4d7848e5b79f04f04a0d9ac4ceadb32cd294d1 (diff) | |
| download | CMake-0bd82cb1a7be7492df0eb1d9ebb857dc246a0d6d.zip CMake-0bd82cb1a7be7492df0eb1d9ebb857dc246a0d6d.tar.gz CMake-0bd82cb1a7be7492df0eb1d9ebb857dc246a0d6d.tar.bz2 | |
Merge topic 'config-dependent-CMAKE_AUTOMOC'
ea4d784 QtAutomoc: Use config-dependent compile definitions and includes.
67f6ceb QtAutomoc: Fix handling of list separator for compile definitions.
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 7aebc2b..29d9bb3 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1736,7 +1736,8 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args) else if (args[1] == "cmake_automoc") { cmQtAutomoc automoc; - bool automocSuccess = automoc.Run(args[2].c_str()); + const char *config = args[3].empty() ? 0 : args[3].c_str(); + bool automocSuccess = automoc.Run(args[2].c_str(), config); return automocSuccess ? 0 : 1; } #endif |