Move main source files to app subdir

Author: adazem009

CMakeLists.txt

@@ -14,22 +14,8 @@ if (SCRATCHCPP_PLAYER_BUILD_UNIT_TESTS)
     find_package(Qt6 6.6 COMPONENTS Test REQUIRED)
 endif()
 
-add_subdirectory(src)
-add_subdirectory(res)
-
-set_target_properties(appscratchcpp-player PROPERTIES
-    MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
-    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
-    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
-    MACOSX_BUNDLE TRUE
-    WIN32_EXECUTABLE TRUE
-)
-
-target_compile_definitions(appscratchcpp-player
-    PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
-target_link_libraries(appscratchcpp-player
-    PRIVATE Qt6::Quick Qt6::QuickControls2)
-
 set(SCRATCHCPPRENDER_BUILD_UNIT_TESTS OFF)
 add_subdirectory(scratchcpp-render)
-target_link_libraries(appscratchcpp-player PRIVATE scratchcpp-render scratchcpp-renderplugin)
+
+add_subdirectory(src)
+add_subdirectory(res)

build/module.cmake

@@ -24,5 +24,5 @@ list(APPEND QML_IMPORT_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_D
 list(REMOVE_DUPLICATES QML_IMPORT_PATH)
 set(QML_IMPORT_PATH ${QML_IMPORT_PATH} CACHE STRING "" FORCE)
 
-target_link_libraries(appscratchcpp-player PRIVATE ${MODULE})
+target_link_libraries(${APP_TARGET} PRIVATE ${MODULE})
 set(MODULE_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR})

res/icons/CMakeLists.txt

@@ -1,12 +1,12 @@
 qt_add_resources(
-    appscratchcpp-player "icon_theme"
+    ${APP_TARGET} "icon_theme"
     PREFIX "/icons/scratchcpp"
     FILES
         index.theme
 )
 
 qt_add_resources(
-    appscratchcpp-player "icons"
+    ${APP_TARGET} "icons"
     PREFIX "/icons/scratchcpp/32x32"
     FILES
         green_flag.svg

src/CMakeLists.txt

@@ -1,12 +1,4 @@
-qt_add_executable(appscratchcpp-player
-    main.cpp
-)
-
-qt_add_qml_module(appscratchcpp-player
-    URI ScratchCPP
-    VERSION 1.0
-    QML_FILES main.qml
-)
+add_subdirectory(app)
 
 add_subdirectory(global)
 add_subdirectory(uicomponents)

src/app/CMakeLists.txt

@@ -0,0 +1,26 @@
+set(APP_TARGET scratchcpp-player CACHE INTERNAL "")
+
+qt_add_executable(${APP_TARGET}
+    main.cpp
+)
+
+qt_add_qml_module(${APP_TARGET}
+    URI ScratchCPP
+    VERSION 1.0
+    QML_FILES main.qml
+)
+
+set_target_properties(${APP_TARGET} PROPERTIES
+    MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
+    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
+    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+    MACOSX_BUNDLE TRUE
+    WIN32_EXECUTABLE TRUE
+)
+
+target_compile_definitions(${APP_TARGET}
+    PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
+target_link_libraries(${APP_TARGET}
+    PRIVATE Qt6::Quick Qt6::QuickControls2)
+
+target_link_libraries(${APP_TARGET} PRIVATE scratchcpp-render scratchcpp-renderplugin)