diff options
| -rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Tests/QtAutogen/CommonTests.cmake | 3 | ||||
| -rw-r--r-- | Tests/QtAutogen/MacOsFW/CMakeLists.txt (renamed from Tests/QtAutogen/macosFW/CMakeLists.txt) | 5 | ||||
| -rw-r--r-- | Tests/QtAutogen/MacOsFW/src/CMakeLists.txt (renamed from Tests/QtAutogen/macosFW/src/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/MacOsFW/src/macos_fw_lib.cpp (renamed from Tests/QtAutogen/macosFW/src/macos_fw_lib.cpp) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/MacOsFW/src/macos_fw_lib.h (renamed from Tests/QtAutogen/macosFW/src/macos_fw_lib.h) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/MacOsFW/test/CMakeLists.txt (renamed from Tests/QtAutogen/macosFW/test/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp (renamed from Tests/QtAutogen/macosFW/test/testMacosFWLib.cpp) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/MacOsFW/test/testMacosFWLib.h (renamed from Tests/QtAutogen/macosFW/test/testMacosFWLib.h) | 0 |
9 files changed, 6 insertions, 8 deletions
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index 8fb9ab3..d13c826 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -60,12 +60,6 @@ if(NON_ASCII_BDIR AND WIN32) endif() # -- Test -# MacOS Framework -if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4)) - add_subdirectory(macosFW) -endif() - -# -- Test # Source files with the same basename in different subdirectories add_subdirectory(sameName) diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake index 9e49153..1e2894e 100644 --- a/Tests/QtAutogen/CommonTests.cmake +++ b/Tests/QtAutogen/CommonTests.cmake @@ -25,3 +25,6 @@ if(QT_TEST_ALLOW_QT_MACROS) endif() ADD_AUTOGEN_TEST(UicInclude uicInclude) ADD_AUTOGEN_TEST(ObjectLibrary someProgram) +if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4)) + ADD_AUTOGEN_TEST(MacOsFW) +endif() diff --git a/Tests/QtAutogen/macosFW/CMakeLists.txt b/Tests/QtAutogen/MacOsFW/CMakeLists.txt index 114d9ba..26d2019 100644 --- a/Tests/QtAutogen/macosFW/CMakeLists.txt +++ b/Tests/QtAutogen/MacOsFW/CMakeLists.txt @@ -1,5 +1,6 @@ -cmake_minimum_required(VERSION 3.8) -project(macos-fw-test) +cmake_minimum_required(VERSION 3.10) +project(MacOsFW) +include("../AutogenTest.cmake") find_package(Qt5Test REQUIRED) diff --git a/Tests/QtAutogen/macosFW/src/CMakeLists.txt b/Tests/QtAutogen/MacOsFW/src/CMakeLists.txt index a02be00..a02be00 100644 --- a/Tests/QtAutogen/macosFW/src/CMakeLists.txt +++ b/Tests/QtAutogen/MacOsFW/src/CMakeLists.txt diff --git a/Tests/QtAutogen/macosFW/src/macos_fw_lib.cpp b/Tests/QtAutogen/MacOsFW/src/macos_fw_lib.cpp index 881a8c9..881a8c9 100644 --- a/Tests/QtAutogen/macosFW/src/macos_fw_lib.cpp +++ b/Tests/QtAutogen/MacOsFW/src/macos_fw_lib.cpp diff --git a/Tests/QtAutogen/macosFW/src/macos_fw_lib.h b/Tests/QtAutogen/MacOsFW/src/macos_fw_lib.h index e66e0ea..e66e0ea 100644 --- a/Tests/QtAutogen/macosFW/src/macos_fw_lib.h +++ b/Tests/QtAutogen/MacOsFW/src/macos_fw_lib.h diff --git a/Tests/QtAutogen/macosFW/test/CMakeLists.txt b/Tests/QtAutogen/MacOsFW/test/CMakeLists.txt index 521c184..521c184 100644 --- a/Tests/QtAutogen/macosFW/test/CMakeLists.txt +++ b/Tests/QtAutogen/MacOsFW/test/CMakeLists.txt diff --git a/Tests/QtAutogen/macosFW/test/testMacosFWLib.cpp b/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp index 3476d61..3476d61 100644 --- a/Tests/QtAutogen/macosFW/test/testMacosFWLib.cpp +++ b/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp diff --git a/Tests/QtAutogen/macosFW/test/testMacosFWLib.h b/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.h index 1fe8dae..1fe8dae 100644 --- a/Tests/QtAutogen/macosFW/test/testMacosFWLib.h +++ b/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.h |