From 76b4e5e3a7ebfc34d1663d4b920679f7e71f5c27 Mon Sep 17 00:00:00 2001 From: Martin Delille Date: Thu, 26 Jan 2023 10:19:50 +0100 Subject: [PATCH] CMake handle Qt6 --- .gitignore | 3 ++- QtAwesome/CMakeLists.txt | 10 +++++----- QtAwesomeSample/CMakeLists.txt | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 QtAwesomeSample/CMakeLists.txt diff --git a/.gitignore b/.gitignore index ca40fa6..663c398 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .DS_Store *.pro.user -/*build* \ No newline at end of file +CMakeLists.txt.user +/*build* diff --git a/QtAwesome/CMakeLists.txt b/QtAwesome/CMakeLists.txt index 13b1bf5..91051ed 100644 --- a/QtAwesome/CMakeLists.txt +++ b/QtAwesome/CMakeLists.txt @@ -1,15 +1,15 @@ project(QtAwesome) -add_library(QtAwesome +add_library(${PROJECT_NAME} QtAwesome.cpp QtAwesomeAnim.cpp QtAwesome.qrc ) -target_include_directories(QtAwesome - PUBLIC ${PROJECT_SOURCE_DIR} +target_include_directories(${PROJECT_NAME} + INTERFACE ${PROJECT_SOURCE_DIR} ) -target_link_libraries(QtAwesome PUBLIC - Qt5::Widgets +target_link_libraries(${PROJECT_NAME} PUBLIC + Qt${QT_VERSION_MAJOR}::Widgets ) diff --git a/QtAwesomeSample/CMakeLists.txt b/QtAwesomeSample/CMakeLists.txt new file mode 100644 index 0000000..135f94e --- /dev/null +++ b/QtAwesomeSample/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 3.16) +project(QtAwesomeSample) + +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Widgets) + +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) + +add_subdirectory(../QtAwesome QtAwesome) + +add_executable(${PROJECT_NAME} main.cpp) + +target_link_libraries(${PROJECT_NAME} + PUBLIC QtAwesome +)