refactor mv: res/gui => src/gui/res

cmake/Libraries.cmake

@@ -354,8 +354,7 @@ macro(configure_qt)
 
   message(STATUS "Qt version: ${Qt6_VERSION}")
 
-  set(GUI_RES_DIR ${DESKFLOW_RES_DIR}/gui)
+  set(GUI_QRC_FILE ${PROJECT_SOURCE_DIR}/src/gui/res/app.qrc)
-  set(GUI_QRC_FILE ${GUI_RES_DIR}/app.qrc)
 
 endmacro()
 

src/gui/CMakeLists.txt

@@ -20,12 +20,10 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-set(res_dir ${GUI_RES_DIR})
-set(qrc_file ${GUI_QRC_FILE})
-
 file(
   GLOB
   sources
+  res/app.qrc
   src/*.cpp
   src/*.h
   src/dialogs/*.h
@@ -48,7 +46,7 @@ include_directories(${PROJECT_BINARY_DIR}/src/lib/gui/gui_autogen/include)
 # generated includes
 include_directories(${PROJECT_BINARY_DIR}/config)
 
-add_executable(${target} WIN32 ${sources} ${ui_files} ${rc_files} ${qrc_file})
+add_executable(${target} WIN32 ${sources} ${ui_files} ${rc_files})
 
 target_link_libraries(
   ${target}

src/lib/gui/CMakeLists.txt

@@ -15,9 +15,6 @@
 
 set(target gui)
 
-set(res_dir ${GUI_RES_DIR})
-set(qrc_file ${GUI_QRC_FILE})
-
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
@@ -38,7 +35,7 @@ endif()
 # generated includes
 include_directories(${PROJECT_BINARY_DIR}/config)
 
-add_library(${target} STATIC ${sources} ${qrc_file})
+add_library(${target} STATIC ${sources})
 
 target_link_libraries(
   ${target}