diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-12-08 19:01:48 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-12-13 12:50:18 (GMT) |
| commit | b8ef28ae1f442144f55e23b8defffe01aa350c44 (patch) | |
| tree | 7dfb2158fbd85e80f50e31611acceefcd3350a0a | |
| parent | 0b6ad59ea6b74379f4aefb42c2402355c393c656 (diff) | |
| download | CMake-b8ef28ae1f442144f55e23b8defffe01aa350c44.zip CMake-b8ef28ae1f442144f55e23b8defffe01aa350c44.tar.gz CMake-b8ef28ae1f442144f55e23b8defffe01aa350c44.tar.bz2 | |
Autogen: Tests: Separate ObjectLibrary test
| -rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/QtAutogen/CommonTests.cmake | 1 | ||||
| -rw-r--r-- | Tests/QtAutogen/ObjectLibrary/CMakeLists.txt (renamed from Tests/QtAutogen/objectLibrary/CMakeLists.txt) | 4 | ||||
| -rw-r--r-- | Tests/QtAutogen/ObjectLibrary/a/CMakeLists.txt (renamed from Tests/QtAutogen/objectLibrary/a/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/ObjectLibrary/a/classa.cpp (renamed from Tests/QtAutogen/objectLibrary/a/classa.cpp) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/ObjectLibrary/a/classa.h (renamed from Tests/QtAutogen/objectLibrary/a/classa.h) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/ObjectLibrary/b/classb.cpp (renamed from Tests/QtAutogen/objectLibrary/b/classb.cpp) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/ObjectLibrary/b/classb.h (renamed from Tests/QtAutogen/objectLibrary/b/classb.h) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/ObjectLibrary/main.cpp (renamed from Tests/QtAutogen/objectLibrary/main.cpp) | 0 |
9 files changed, 5 insertions, 4 deletions
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index 288ae60..8fb9ab3 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -60,10 +60,6 @@ if(NON_ASCII_BDIR AND WIN32) endif() # -- Test -# OBJECT libraries -add_subdirectory(objectLibrary) - -# -- Test # MacOS Framework if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4)) add_subdirectory(macosFW) diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake index e873d06..9e49153 100644 --- a/Tests/QtAutogen/CommonTests.cmake +++ b/Tests/QtAutogen/CommonTests.cmake @@ -24,3 +24,4 @@ if(QT_TEST_ALLOW_QT_MACROS) ADD_AUTOGEN_TEST(MocCMP0071) endif() ADD_AUTOGEN_TEST(UicInclude uicInclude) +ADD_AUTOGEN_TEST(ObjectLibrary someProgram) diff --git a/Tests/QtAutogen/objectLibrary/CMakeLists.txt b/Tests/QtAutogen/ObjectLibrary/CMakeLists.txt index 9b29a40..088a24c 100644 --- a/Tests/QtAutogen/objectLibrary/CMakeLists.txt +++ b/Tests/QtAutogen/ObjectLibrary/CMakeLists.txt @@ -1,3 +1,7 @@ +cmake_minimum_required(VERSION 3.10) +project(ObjectLibrary) +include("../AutogenTest.cmake") + set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) diff --git a/Tests/QtAutogen/objectLibrary/a/CMakeLists.txt b/Tests/QtAutogen/ObjectLibrary/a/CMakeLists.txt index fe76ac3..fe76ac3 100644 --- a/Tests/QtAutogen/objectLibrary/a/CMakeLists.txt +++ b/Tests/QtAutogen/ObjectLibrary/a/CMakeLists.txt diff --git a/Tests/QtAutogen/objectLibrary/a/classa.cpp b/Tests/QtAutogen/ObjectLibrary/a/classa.cpp index 4f08fda..4f08fda 100644 --- a/Tests/QtAutogen/objectLibrary/a/classa.cpp +++ b/Tests/QtAutogen/ObjectLibrary/a/classa.cpp diff --git a/Tests/QtAutogen/objectLibrary/a/classa.h b/Tests/QtAutogen/ObjectLibrary/a/classa.h index fa5fed9..fa5fed9 100644 --- a/Tests/QtAutogen/objectLibrary/a/classa.h +++ b/Tests/QtAutogen/ObjectLibrary/a/classa.h diff --git a/Tests/QtAutogen/objectLibrary/b/classb.cpp b/Tests/QtAutogen/ObjectLibrary/b/classb.cpp index 26e0926..26e0926 100644 --- a/Tests/QtAutogen/objectLibrary/b/classb.cpp +++ b/Tests/QtAutogen/ObjectLibrary/b/classb.cpp diff --git a/Tests/QtAutogen/objectLibrary/b/classb.h b/Tests/QtAutogen/ObjectLibrary/b/classb.h index 783bb48..783bb48 100644 --- a/Tests/QtAutogen/objectLibrary/b/classb.h +++ b/Tests/QtAutogen/ObjectLibrary/b/classb.h diff --git a/Tests/QtAutogen/objectLibrary/main.cpp b/Tests/QtAutogen/ObjectLibrary/main.cpp index cacf0fd..cacf0fd 100644 --- a/Tests/QtAutogen/objectLibrary/main.cpp +++ b/Tests/QtAutogen/ObjectLibrary/main.cpp |