From d7868687c814cded6319dd0cfd9fff5c737bf0f0 Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Fri, 8 Dec 2017 20:07:55 +0100 Subject: Autogen: Tests: Separate MacOsFW test --- Tests/QtAutogen/CMakeLists.txt | 6 ---- Tests/QtAutogen/CommonTests.cmake | 3 ++ Tests/QtAutogen/MacOsFW/CMakeLists.txt | 21 +++++++++++++ Tests/QtAutogen/MacOsFW/src/CMakeLists.txt | 33 +++++++++++++++++++ Tests/QtAutogen/MacOsFW/src/macos_fw_lib.cpp | 17 ++++++++++ Tests/QtAutogen/MacOsFW/src/macos_fw_lib.h | 18 +++++++++++ Tests/QtAutogen/MacOsFW/test/CMakeLists.txt | 19 +++++++++++ Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp | 42 +++++++++++++++++++++++++ Tests/QtAutogen/MacOsFW/test/testMacosFWLib.h | 7 +++++ Tests/QtAutogen/macosFW/CMakeLists.txt | 20 ------------ Tests/QtAutogen/macosFW/src/CMakeLists.txt | 33 ------------------- Tests/QtAutogen/macosFW/src/macos_fw_lib.cpp | 17 ---------- Tests/QtAutogen/macosFW/src/macos_fw_lib.h | 18 ----------- Tests/QtAutogen/macosFW/test/CMakeLists.txt | 19 ----------- Tests/QtAutogen/macosFW/test/testMacosFWLib.cpp | 42 ------------------------- Tests/QtAutogen/macosFW/test/testMacosFWLib.h | 7 ----- 16 files changed, 160 insertions(+), 162 deletions(-) create mode 100644 Tests/QtAutogen/MacOsFW/CMakeLists.txt create mode 100644 Tests/QtAutogen/MacOsFW/src/CMakeLists.txt create mode 100644 Tests/QtAutogen/MacOsFW/src/macos_fw_lib.cpp create mode 100644 Tests/QtAutogen/MacOsFW/src/macos_fw_lib.h create mode 100644 Tests/QtAutogen/MacOsFW/test/CMakeLists.txt create mode 100644 Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp create mode 100644 Tests/QtAutogen/MacOsFW/test/testMacosFWLib.h delete mode 100644 Tests/QtAutogen/macosFW/CMakeLists.txt delete mode 100644 Tests/QtAutogen/macosFW/src/CMakeLists.txt delete mode 100644 Tests/QtAutogen/macosFW/src/macos_fw_lib.cpp delete mode 100644 Tests/QtAutogen/macosFW/src/macos_fw_lib.h delete mode 100644 Tests/QtAutogen/macosFW/test/CMakeLists.txt delete mode 100644 Tests/QtAutogen/macosFW/test/testMacosFWLib.cpp delete mode 100644 Tests/QtAutogen/macosFW/test/testMacosFWLib.h 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 new file mode 100644 index 0000000..26d2019 --- /dev/null +++ b/Tests/QtAutogen/MacOsFW/CMakeLists.txt @@ -0,0 +1,21 @@ +cmake_minimum_required(VERSION 3.10) +project(MacOsFW) +include("../AutogenTest.cmake") + +find_package(Qt5Test REQUIRED) + +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/lib) +set(CMAKE_INSTALL_NAME_DIR ${CMAKE_BINARY_DIR}/output/lib) + +if(POLICY CMP0042) # in CMake 3.0.0+ + set (CMAKE_MACOSX_RPATH OFF) # otherwise ON by default +endif(POLICY CMP0042) + +if(POLICY CMP0068) # in CMake 3.9+ + cmake_policy(SET CMP0068 NEW) +endif(POLICY CMP0068) + +add_subdirectory(src) +add_subdirectory(test) diff --git a/Tests/QtAutogen/MacOsFW/src/CMakeLists.txt b/Tests/QtAutogen/MacOsFW/src/CMakeLists.txt new file mode 100644 index 0000000..a02be00 --- /dev/null +++ b/Tests/QtAutogen/MacOsFW/src/CMakeLists.txt @@ -0,0 +1,33 @@ +set(MACOS_FW_LIB_VERSION "0.1") +set(MACOS_FW_LIB_SRCS + macos_fw_lib.cpp +) +set(MACOS_FW_LIB_HDRS + macos_fw_lib.h +) + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${Qt5Core_INCLUDE_DIRS} +) + +add_library(macos_fw_lib SHARED + ${MACOS_FW_LIB_SRCS} + ${MACOS_FW_LIB_HDRS} +) +set_target_properties(macos_fw_lib PROPERTIES AUTOMOC TRUE) +set_target_properties(macos_fw_lib PROPERTIES + CLEAN_DIRECT_OUTPUT 1 + FRAMEWORK 1 + FRAMEWORK_VERSION ${MACOS_FW_LIB_VERSION} + VERSION ${MACOS_FW_LIB_VERSION} + SOVERSION ${MACOS_FW_LIB_VERSION} + MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${MACOS_FW_LIB_VERSION} + MACOSX_FRAMEWORK_IDENTIFIER org.macos.fw_lib + POSITION_INDEPENDENT_CODE ON + PUBLIC_HEADER "${MACOS_FW_LIB_HDRS}" +) +target_link_libraries(macos_fw_lib + Qt5::Core +) diff --git a/Tests/QtAutogen/MacOsFW/src/macos_fw_lib.cpp b/Tests/QtAutogen/MacOsFW/src/macos_fw_lib.cpp new file mode 100644 index 0000000..881a8c9 --- /dev/null +++ b/Tests/QtAutogen/MacOsFW/src/macos_fw_lib.cpp @@ -0,0 +1,17 @@ +#include "macos_fw_lib.h" + +#include +#include + +MacosFWLib::MacosFWLib() +{ +} + +MacosFWLib::~MacosFWLib() +{ +} + +QString MacosFWLib::qtVersionString() const +{ + return QString(qVersion()); +} diff --git a/Tests/QtAutogen/MacOsFW/src/macos_fw_lib.h b/Tests/QtAutogen/MacOsFW/src/macos_fw_lib.h new file mode 100644 index 0000000..e66e0ea --- /dev/null +++ b/Tests/QtAutogen/MacOsFW/src/macos_fw_lib.h @@ -0,0 +1,18 @@ +#ifndef MACOSFWLIB_H +#define MACOSFWLIB_H + +#include +#include + +class __attribute__((visibility("default"))) MacosFWLib : public QObject +{ + Q_OBJECT + +public: + explicit MacosFWLib(); + ~MacosFWLib(); + + QString qtVersionString() const; +}; + +#endif // MACOSFWLIB_H diff --git a/Tests/QtAutogen/MacOsFW/test/CMakeLists.txt b/Tests/QtAutogen/MacOsFW/test/CMakeLists.txt new file mode 100644 index 0000000..521c184 --- /dev/null +++ b/Tests/QtAutogen/MacOsFW/test/CMakeLists.txt @@ -0,0 +1,19 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/../src +) +include_directories(SYSTEM + ${Qt5Core_INCLUDE_DIRS} + ${Qt5Widgets_INCLUDE_DIRS} +) + +set(testname AutomocMacosFWLib) +add_executable(${testname} testMacosFWLib.cpp) +set_target_properties(${testname} PROPERTIES AUTOMOC TRUE) +target_link_libraries(${testname} + Qt5::Core + Qt5::Widgets + Qt5::Test + macos_fw_lib +) diff --git a/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp b/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp new file mode 100644 index 0000000..3476d61 --- /dev/null +++ b/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp @@ -0,0 +1,42 @@ +#include +#include + +#include "macos_fw_lib.h" +#include "testMacosFWLib.h" + +class TestMacosFWLib : public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void cleanupTestCase(); + void init() {} + void cleanup() {} + + void testQtVersion(); +}; + +void TestMacosFWLib::initTestCase() +{ +} + +void TestMacosFWLib::cleanupTestCase() +{ +} + +void TestMacosFWLib::testQtVersion() +{ + MacosFWLib* testLib = new MacosFWLib(); + QVERIFY(testLib->qtVersionString().contains("5.")); + testLib->deleteLater(); +} + +int main(int argc, char* argv[]) +{ + QApplication app(argc, argv, false); + MacosFWLib testObject; + return QTest::qExec(&testObject, argc, argv); +} + +#include "testMacosFWLib.moc" diff --git a/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.h b/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.h new file mode 100644 index 0000000..1fe8dae --- /dev/null +++ b/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.h @@ -0,0 +1,7 @@ +#ifndef TESTMACOSFWLIB_H +#define TESTMACOSFWLIB_H + +#include "qapplication.h" +#include + +#endif // TESTMACOSFWLIB_H diff --git a/Tests/QtAutogen/macosFW/CMakeLists.txt b/Tests/QtAutogen/macosFW/CMakeLists.txt deleted file mode 100644 index 114d9ba..0000000 --- a/Tests/QtAutogen/macosFW/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -cmake_minimum_required(VERSION 3.8) -project(macos-fw-test) - -find_package(Qt5Test REQUIRED) - -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/lib) -set(CMAKE_INSTALL_NAME_DIR ${CMAKE_BINARY_DIR}/output/lib) - -if(POLICY CMP0042) # in CMake 3.0.0+ - set (CMAKE_MACOSX_RPATH OFF) # otherwise ON by default -endif(POLICY CMP0042) - -if(POLICY CMP0068) # in CMake 3.9+ - cmake_policy(SET CMP0068 NEW) -endif(POLICY CMP0068) - -add_subdirectory(src) -add_subdirectory(test) diff --git a/Tests/QtAutogen/macosFW/src/CMakeLists.txt b/Tests/QtAutogen/macosFW/src/CMakeLists.txt deleted file mode 100644 index a02be00..0000000 --- a/Tests/QtAutogen/macosFW/src/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -set(MACOS_FW_LIB_VERSION "0.1") -set(MACOS_FW_LIB_SRCS - macos_fw_lib.cpp -) -set(MACOS_FW_LIB_HDRS - macos_fw_lib.h -) - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${Qt5Core_INCLUDE_DIRS} -) - -add_library(macos_fw_lib SHARED - ${MACOS_FW_LIB_SRCS} - ${MACOS_FW_LIB_HDRS} -) -set_target_properties(macos_fw_lib PROPERTIES AUTOMOC TRUE) -set_target_properties(macos_fw_lib PROPERTIES - CLEAN_DIRECT_OUTPUT 1 - FRAMEWORK 1 - FRAMEWORK_VERSION ${MACOS_FW_LIB_VERSION} - VERSION ${MACOS_FW_LIB_VERSION} - SOVERSION ${MACOS_FW_LIB_VERSION} - MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${MACOS_FW_LIB_VERSION} - MACOSX_FRAMEWORK_IDENTIFIER org.macos.fw_lib - POSITION_INDEPENDENT_CODE ON - PUBLIC_HEADER "${MACOS_FW_LIB_HDRS}" -) -target_link_libraries(macos_fw_lib - Qt5::Core -) diff --git a/Tests/QtAutogen/macosFW/src/macos_fw_lib.cpp b/Tests/QtAutogen/macosFW/src/macos_fw_lib.cpp deleted file mode 100644 index 881a8c9..0000000 --- a/Tests/QtAutogen/macosFW/src/macos_fw_lib.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "macos_fw_lib.h" - -#include -#include - -MacosFWLib::MacosFWLib() -{ -} - -MacosFWLib::~MacosFWLib() -{ -} - -QString MacosFWLib::qtVersionString() const -{ - return QString(qVersion()); -} diff --git a/Tests/QtAutogen/macosFW/src/macos_fw_lib.h b/Tests/QtAutogen/macosFW/src/macos_fw_lib.h deleted file mode 100644 index e66e0ea..0000000 --- a/Tests/QtAutogen/macosFW/src/macos_fw_lib.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef MACOSFWLIB_H -#define MACOSFWLIB_H - -#include -#include - -class __attribute__((visibility("default"))) MacosFWLib : public QObject -{ - Q_OBJECT - -public: - explicit MacosFWLib(); - ~MacosFWLib(); - - QString qtVersionString() const; -}; - -#endif // MACOSFWLIB_H diff --git a/Tests/QtAutogen/macosFW/test/CMakeLists.txt b/Tests/QtAutogen/macosFW/test/CMakeLists.txt deleted file mode 100644 index 521c184..0000000 --- a/Tests/QtAutogen/macosFW/test/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../src -) -include_directories(SYSTEM - ${Qt5Core_INCLUDE_DIRS} - ${Qt5Widgets_INCLUDE_DIRS} -) - -set(testname AutomocMacosFWLib) -add_executable(${testname} testMacosFWLib.cpp) -set_target_properties(${testname} PROPERTIES AUTOMOC TRUE) -target_link_libraries(${testname} - Qt5::Core - Qt5::Widgets - Qt5::Test - macos_fw_lib -) diff --git a/Tests/QtAutogen/macosFW/test/testMacosFWLib.cpp b/Tests/QtAutogen/macosFW/test/testMacosFWLib.cpp deleted file mode 100644 index 3476d61..0000000 --- a/Tests/QtAutogen/macosFW/test/testMacosFWLib.cpp +++ /dev/null @@ -1,42 +0,0 @@ -#include -#include - -#include "macos_fw_lib.h" -#include "testMacosFWLib.h" - -class TestMacosFWLib : public QObject -{ - Q_OBJECT - -private slots: - void initTestCase(); - void cleanupTestCase(); - void init() {} - void cleanup() {} - - void testQtVersion(); -}; - -void TestMacosFWLib::initTestCase() -{ -} - -void TestMacosFWLib::cleanupTestCase() -{ -} - -void TestMacosFWLib::testQtVersion() -{ - MacosFWLib* testLib = new MacosFWLib(); - QVERIFY(testLib->qtVersionString().contains("5.")); - testLib->deleteLater(); -} - -int main(int argc, char* argv[]) -{ - QApplication app(argc, argv, false); - MacosFWLib testObject; - return QTest::qExec(&testObject, argc, argv); -} - -#include "testMacosFWLib.moc" diff --git a/Tests/QtAutogen/macosFW/test/testMacosFWLib.h b/Tests/QtAutogen/macosFW/test/testMacosFWLib.h deleted file mode 100644 index 1fe8dae..0000000 --- a/Tests/QtAutogen/macosFW/test/testMacosFWLib.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef TESTMACOSFWLIB_H -#define TESTMACOSFWLIB_H - -#include "qapplication.h" -#include - -#endif // TESTMACOSFWLIB_H -- cgit v0.12