diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-06-11 13:52:48 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-06-12 10:53:25 (GMT) |
| commit | ea4d7848e5b79f04f04a0d9ac4ceadb32cd294d1 (patch) | |
| tree | 2ec037d2d5a2711b509a4841c56341c91332acea /Source/cmake.cxx | |
| parent | 67f6cebb1ea3557c3e3144023ba3fea2f5f97ceb (diff) | |
| download | CMake-ea4d7848e5b79f04f04a0d9ac4ceadb32cd294d1.zip CMake-ea4d7848e5b79f04f04a0d9ac4ceadb32cd294d1.tar.gz CMake-ea4d7848e5b79f04f04a0d9ac4ceadb32cd294d1.tar.bz2 | |
QtAutomoc: Use config-dependent compile definitions and includes.
Instead of always using the includes and defines which are not
config-specific, ensure that the config specific ones can be used.
Task-number: #13589
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 e757f3a..9352e33 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1737,7 +1737,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 |