diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-01-24 12:02:16 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-01-28 20:04:10 (GMT) |
| commit | 321e348e133f2f62dd51cd663fe30c7513ea53d8 (patch) | |
| tree | 284062c935e209110b204d06b07ebeb07be9cecf /Tests | |
| parent | e96683b048e1d710b1bb0791b816638207283ef0 (diff) | |
| download | CMake-321e348e133f2f62dd51cd663fe30c7513ea53d8.zip CMake-321e348e133f2f62dd51cd663fe30c7513ea53d8.tar.gz CMake-321e348e133f2f62dd51cd663fe30c7513ea53d8.tar.bz2 | |
QtAutogen: Use Qt 4 IMPORTED targets to find executable locations.
Avoid using the moc from Qt 5 with Qt 4 based targets. Moc generates
a version check to ensure that such generated code does not compile.
The Qt4And5Automoc unit test should have been testing this, but it
was not because the test was broken. In that unit test, moc was run
on trivial files which have no significant content, and in particular
no Q_OBJECT macro. Therefore moc was generating empty files which
do not even contain the version check. Fix this by generating files
for input to moc at cmake time.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Qt4And5Automoc/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | Tests/Qt4And5Automoc/main.cpp.in (renamed from Tests/Qt4And5Automoc/main.cpp) | 0 | ||||
| -rw-r--r-- | Tests/Qt4And5Automoc/main_qt4.cpp | 4 | ||||
| -rw-r--r-- | Tests/Qt4And5Automoc/main_qt5.cpp | 4 |
4 files changed, 13 insertions, 10 deletions
diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt b/Tests/Qt4And5Automoc/CMakeLists.txt index 0cc80fe..61d5743 100644 --- a/Tests/Qt4And5Automoc/CMakeLists.txt +++ b/Tests/Qt4And5Automoc/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 2.8.12) project(Qt4And5Automoc) @@ -7,7 +8,17 @@ find_package(Qt5Core REQUIRED) set(CMAKE_AUTOMOC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) -add_executable(qt4_exe main_qt4.cpp) +macro(generate_main_file VERSION) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/main.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/main_qt${VERSION}.cpp" COPYONLY) + file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/main_qt${VERSION}.cpp" + "#include \"main_qt${VERSION}.moc\"\n" + ) +endmacro() + +generate_main_file(4) +generate_main_file(5) + +add_executable(qt4_exe "${CMAKE_CURRENT_BINARY_DIR}/main_qt4.cpp") target_link_libraries(qt4_exe Qt4::QtCore) -add_executable(qt5_exe main_qt5.cpp) +add_executable(qt5_exe "${CMAKE_CURRENT_BINARY_DIR}/main_qt5.cpp") target_link_libraries(qt5_exe Qt5::Core) diff --git a/Tests/Qt4And5Automoc/main.cpp b/Tests/Qt4And5Automoc/main.cpp.in index 00fd641..00fd641 100644 --- a/Tests/Qt4And5Automoc/main.cpp +++ b/Tests/Qt4And5Automoc/main.cpp.in diff --git a/Tests/Qt4And5Automoc/main_qt4.cpp b/Tests/Qt4And5Automoc/main_qt4.cpp deleted file mode 100644 index a84ce89..0000000 --- a/Tests/Qt4And5Automoc/main_qt4.cpp +++ /dev/null @@ -1,4 +0,0 @@ - -#include "main.cpp" - -#include "main_qt4.moc" diff --git a/Tests/Qt4And5Automoc/main_qt5.cpp b/Tests/Qt4And5Automoc/main_qt5.cpp deleted file mode 100644 index 287b261..0000000 --- a/Tests/Qt4And5Automoc/main_qt5.cpp +++ /dev/null @@ -1,4 +0,0 @@ - -#include "main.cpp" - -#include "main_qt5.moc" |