From 256ba2411bccffd51a6c0a0f18bae3bae0de8d6f Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Thu, 6 Mar 2025 17:37:37 -0500 Subject: [PATCH] refactor: move qt automoc, uic and rcc to a single place in Librarires.cmake --- cmake/Libraries.cmake | 4 ++++ src/apps/deskflow-gui/CMakeLists.txt | 4 ---- src/lib/common/CMakeLists.txt | 1 + src/lib/deskflow/CMakeLists.txt | 2 -- src/lib/gui/CMakeLists.txt | 3 --- src/test/CMakeLists.txt | 3 --- 6 files changed, 5 insertions(+), 12 deletions(-) diff --git a/cmake/Libraries.cmake b/cmake/Libraries.cmake index 14fc4f14b..4f17709d3 100644 --- a/cmake/Libraries.cmake +++ b/cmake/Libraries.cmake @@ -35,6 +35,10 @@ macro(configure_libs) find_program(DEPLOYQT macdeployqt) endif() + set(CMAKE_AUTOMOC ON) + set(CMAKE_AUTOUIC ON) + set(CMAKE_AUTORCC ON) + message(STATUS "Qt version: ${Qt6_VERSION}") option(ENABLE_COVERAGE "Enable test coverage" OFF) diff --git a/src/apps/deskflow-gui/CMakeLists.txt b/src/apps/deskflow-gui/CMakeLists.txt index 7b0901888..aef05edc2 100644 --- a/src/apps/deskflow-gui/CMakeLists.txt +++ b/src/apps/deskflow-gui/CMakeLists.txt @@ -8,10 +8,6 @@ else() set(target deskflow) endif() - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) if(WIN32) diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt index b788eb2be..c0282b949 100644 --- a/src/lib/common/CMakeLists.txt +++ b/src/lib/common/CMakeLists.txt @@ -18,6 +18,7 @@ add_library(common STATIC stdvector.h ${CMAKE_CURRENT_BINARY_DIR}/constants.h ) + set_target_properties(common PROPERTIES LINKER_LANGUAGE CXX) target_link_libraries(common PUBLIC Qt6::Core) diff --git a/src/lib/deskflow/CMakeLists.txt b/src/lib/deskflow/CMakeLists.txt index f6617992c..72c81181a 100644 --- a/src/lib/deskflow/CMakeLists.txt +++ b/src/lib/deskflow/CMakeLists.txt @@ -49,8 +49,6 @@ endif() ####################Start Making Library######################### set(lib_name app) -set(CMAKE_AUTOMOC ON) - # arch if(WIN32) set(PLATFORM_CODE diff --git a/src/lib/gui/CMakeLists.txt b/src/lib/gui/CMakeLists.txt index 31af3761d..409cb740d 100644 --- a/src/lib/gui/CMakeLists.txt +++ b/src/lib/gui/CMakeLists.txt @@ -4,9 +4,6 @@ set(target gui) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) if(APPLE) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 5bba82c95..10145e278 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -16,9 +16,6 @@ FetchContent_MakeAvailable(googletest) macro(config_all_tests) - # Required to load images from .qrc file. - set(CMAKE_AUTORCC ON) - set(base_dir ${PROJECT_SOURCE_DIR}) set(src_dir ${base_dir}/src) set(test_base_dir ${src_dir}/test)