diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2016-11-25 12:19:32 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2016-11-29 16:16:33 (GMT) |
| commit | d675004dbac12a938cf60fac39e5b9b81bbb6a99 (patch) | |
| tree | e2be2e3949af0b52310bc21d3e5fc1bee8fff130 | |
| parent | cb4bc19ae1b2f61165543ef926037936b179414d (diff) | |
| download | CMake-d675004dbac12a938cf60fac39e5b9b81bbb6a99.zip CMake-d675004dbac12a938cf60fac39e5b9b81bbb6a99.tar.gz CMake-d675004dbac12a938cf60fac39e5b9b81bbb6a99.tar.bz2 | |
QtAutogen tests: Rename uiconly target to camel case uicOnly
Also move uicOnly sources to dedicated uicOnlySource directory.
| -rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | Tests/QtAutogen/uicOnlySource/uiconly.cpp (renamed from Tests/QtAutogen/sub/uiconly.cpp) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/uicOnlySource/uiconly.h (renamed from Tests/QtAutogen/sub/uiconly.h) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/uicOnlySource/uiconly.ui (renamed from Tests/QtAutogen/sub/uiconly.ui) | 0 |
4 files changed, 6 insertions, 4 deletions
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index b0bc100..6a5d7b5 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -54,6 +54,12 @@ add_executable(rccEmpty rccEmpty.cpp rccEmptyRes.qrc) set_property(TARGET rccEmpty PROPERTY AUTORCC ON) target_link_libraries(rccEmpty ${QT_QTCORE_TARGET}) +# -- Test: UIC only +qtx_wrap_cpp(uicOnlyMoc uicOnlySource/uiconly.h) +add_executable(uicOnly uicOnlySource/uiconly.cpp ${uicOnlyMoc}) +set_property(TARGET uicOnly PROPERTY AUTOUIC ON) +target_link_libraries(uicOnly ${QT_LIBRARIES}) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_definitions(-DFOO -DSomeDefine="Barx") @@ -147,10 +153,6 @@ target_link_libraries(empty no_link_language) add_library(no_link_language STATIC empty.h) set_target_properties(no_link_language PROPERTIES AUTOMOC TRUE) -qtx_wrap_cpp(uicOnlyMoc sub/uiconly.h) -add_executable(uiconly sub/uiconly.cpp ${uicOnlyMoc}) -target_link_libraries(uiconly ${QT_LIBRARIES}) - try_compile(RCC_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends" "${CMAKE_CURRENT_SOURCE_DIR}/autorcc_depends" diff --git a/Tests/QtAutogen/sub/uiconly.cpp b/Tests/QtAutogen/uicOnlySource/uiconly.cpp index ac22789..ac22789 100644 --- a/Tests/QtAutogen/sub/uiconly.cpp +++ b/Tests/QtAutogen/uicOnlySource/uiconly.cpp diff --git a/Tests/QtAutogen/sub/uiconly.h b/Tests/QtAutogen/uicOnlySource/uiconly.h index 9b0b1b4..9b0b1b4 100644 --- a/Tests/QtAutogen/sub/uiconly.h +++ b/Tests/QtAutogen/uicOnlySource/uiconly.h diff --git a/Tests/QtAutogen/sub/uiconly.ui b/Tests/QtAutogen/uicOnlySource/uiconly.ui index 13fb832..13fb832 100644 --- a/Tests/QtAutogen/sub/uiconly.ui +++ b/Tests/QtAutogen/uicOnlySource/uiconly.ui |