diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-09-10 14:20:43 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-09-17 12:39:42 (GMT) |
| commit | b8877b1d62599bba7a014e95fbbd670f177243ce (patch) | |
| tree | ba9c4f149b34ea7d124a5a49e6bf0f78d0802071 | |
| parent | 71a11252e95797113ecb1a969386f496b7d4861b (diff) | |
| download | CMake-b8877b1d62599bba7a014e95fbbd670f177243ce.zip CMake-b8877b1d62599bba7a014e95fbbd670f177243ce.tar.gz CMake-b8877b1d62599bba7a014e95fbbd670f177243ce.tar.bz2 | |
QtAutogen: Add source files to target when only AUTORCC is used.
Add missing entry to if condition.
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 3 | ||||
| -rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/QtAutogen/rcconly.cpp | 9 |
3 files changed, 14 insertions, 1 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index a8bb317..4b8f810 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -392,7 +392,8 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget const* target) std::map<std::string, std::string> configUicOptions; if (target->GetPropertyAsBool("AUTOMOC") - || target->GetPropertyAsBool("AUTOUIC")) + || target->GetPropertyAsBool("AUTOUIC") + || target->GetPropertyAsBool("AUTORCC")) { this->SetupSourceFiles(target); } diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index d2116aa..f9aa309 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -37,6 +37,9 @@ else() endif() +add_executable(rcconly rcconly.cpp second_resource.qrc) +set_property(TARGET rcconly PROPERTY AUTORCC ON) +target_link_libraries(rcconly ${QT_QTCORE_TARGET}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/Tests/QtAutogen/rcconly.cpp b/Tests/QtAutogen/rcconly.cpp new file mode 100644 index 0000000..854c4c1 --- /dev/null +++ b/Tests/QtAutogen/rcconly.cpp @@ -0,0 +1,9 @@ + +extern int qInitResources_second_resource(); + +int main(int, char**) +{ + // Fails to link if the symbol is not present. + qInitResources_second_resource(); + return 0; +} |