Refactor CMake source gathering

eplatonoff · Sep 14, 2024 · 0665d79 · 0665d79
1 parent 98966d0
commit 0665d79
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,9 +39,9 @@ target_wrapper.*
 *.qmlproject.user
 *.qmlproject.user.*
 
-# QtCreator CMake
 CMakeLists.txt.user*
 .idea/
+.zed/
 
 build
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -18,12 +18,14 @@ find_package(Qt6 REQUIRED COMPONENTS
         Multimedia
 )
 
-include_directories(".")
+include_directories(${PROJECT_SOURCE_DIR})
+file(GLOB_RECURSE SRCS RELATIVE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/*.cpp)
+file(GLOB_RECURSE HDRS RELATIVE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/*.h)
+file(GLOB_RECURSE QRCS RELATIVE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/*.qrc)
 
-file(GLOB SRCS_TOP ${PROJECT_SOURCE_DIR}/*.cpp)
-file( GLOB_RECURSE SRCS_NESTED)
-file( GLOB_RECURSE HDRS)
-file( GLOB_RECURSE QRCS *.qrc)
+list(FILTER SRCS EXCLUDE REGEX "^build/")
+list(FILTER HDRS EXCLUDE REGEX "^build/")
+list(FILTER QRCS EXCLUDE REGEX "^build/")
 
 IF(APPLE)
     SET(CMAKE_EXE_LINKER_FLAGS "-framework Foundation -w")
@@ -32,7 +34,7 @@ IF(APPLE)
     )
 ENDIF()
 
-set(SOURCE_FILES ${SRCS_TOP} ${SRCS_NESTED} ${HDRS} ${QRCS})
+set(SOURCE_FILES ${SRCS} ${HDRS} ${QRCS})
 
 qt_add_resources(SOURCE_FILES qml.qrc)
 

diff --git a/src/mac/bundle.sh b/src/mac/bundle.sh
@@ -13,4 +13,4 @@ if [ "${CONFIGURATION}" == "Release" ] || [ "${CONFIGURATION}" == "MinSizeRel" ]
         echo "Removing .dSYM from the bundle: $dsym"
         rm -rf "$dsym"
     done
-fi
+fi