[refactor] Streamline CMakeLists.txt by consolidating project setup and removing unnecessary OS checks

Author: chrisdedman

CMakeLists.txt

@@ -1,134 +1,35 @@
 cmake_minimum_required(VERSION 3.16)
 
-# Project name
-set(TARGET_NAME CodeAstraApp)
-set(EXECUTABLE_NAME CodeAstra)
+project(CodeAstra VERSION 0.1.0 DESCRIPTION "Code Editor written in modern C++ using Qt6")
 
-set(QT_MAJOR_VERSION 6)
-
-project(${TARGET_NAME} VERSION 0.1.0 DESCRIPTION "Code Editor written in C++ using Qt6")
-
-# Enable automatic MOC (Meta-Object Compiler) handling for Qt
-set(CMAKE_AUTOMOC ON)
-
-# Set the CXX standard
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-# Set default build output directories
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR})
-set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
+# Use cmake/ for custom modules
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
-# Detect operating system
-if(WIN32)
-    set(OS_NAME "Windows")
-elseif(APPLE)
-    set(OS_NAME "macOS")
-else()
-    set(OS_NAME "Linux")
-endif()
+# Set output directories
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
-message(STATUS "Building for ${OS_NAME}")
+# Enable Qt tools
+set(CMAKE_AUTOMOC ON)
 
-# Locate Qt installation
-if(DEFINED ENV{Qt${QT_MAJOR_VERSION}_HOME})
-    set(Qt_DIR "$ENV{Qt${QT_MAJOR_VERSION}_HOME}")
-    message(STATUS "Using Qt from: ${Qt_DIR}")
-else()
-    if(WIN32)
-        set(Qt_DIR "C:/Qt/${QT_MAJOR_VERSION}/msvc2022_64/lib/cmake/Qt${QT_MAJOR_VERSION}")
-    elseif(APPLE)
-        set(Qt_DIR "/usr/local/opt/qt/lib/cmake/Qt${QT_MAJOR_VERSION}")
-    else()
-        set(Qt_DIR "/usr/lib/cmake/Qt${QT_MAJOR_VERSION}")
-    endif()
-    message(STATUS "Using default Qt path: ${Qt_DIR}")
-endif()
+# Define target names
+set(TARGET_NAME CodeAstra)
+set(EXECUTABLE_NAME ${TARGET_NAME}App)
 
-# Set Qt path for find_package
-set(CMAKE_PREFIX_PATH ${Qt_DIR})
+# Set Qt version
+set(QT_MAJOR_VERSION 6)
 
-# Find Qt components
+# Find Qt
 find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS Core Widgets Test)
 
-# Locate yaml-cpp
-if(APPLE)
-    set(yaml-cpp_DIR "/opt/homebrew/Cellar/yaml-cpp/0.8.0/lib/cmake/yaml-cpp")
-endif()
+# yaml-cpp
 find_package(yaml-cpp REQUIRED CONFIG)
 
-# Copy YAML files to the build directory (non-macOS case)
-set(YAML_SOURCE_DIR ${CMAKE_SOURCE_DIR}/config)
-set(YAML_DEST_DIR ${CMAKE_BINARY_DIR}/config)
-file(MAKE_DIRECTORY ${YAML_DEST_DIR})
-file(GLOB YAML_FILES "${YAML_SOURCE_DIR}/*.yaml")
-
-foreach(YAML_FILE ${YAML_FILES})
-    file(COPY ${YAML_FILE} DESTINATION ${YAML_DEST_DIR})
-endforeach()
-
-# Create the CodeAstra library
-add_library(${TARGET_NAME}
-    src/MainWindow.cpp
-    src/CodeEditor.cpp
-    src/Tree.cpp
-    src/FileManager.cpp
-    src/Syntax.cpp
-    src/SyntaxManager.cpp
-    include/MainWindow.h
-    include/CodeEditor.h
-    include/Tree.h
-    include/LineNumberArea.h
-    include/FileManager.h
-    include/SyntaxManager.h
-    include/Syntax.h
-)
-
-# Link YAML-CPP to the CodeAstra library
-target_link_libraries(${TARGET_NAME} PRIVATE yaml-cpp)
-
-# Create the executable for the application
-add_executable(${EXECUTABLE_NAME} src/main.cpp)
-
-# Link the main executable with the CodeAstra library and Qt libraries
-target_link_libraries(${EXECUTABLE_NAME} PRIVATE ${TARGET_NAME} Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Widgets)
-
-# Add the tests subdirectory
+# Add subdirectories
+add_subdirectory(src)
 add_subdirectory(tests)
 
-# Qt resource files
-qt_add_resources(APP_RESOURCES resources.qrc)
-target_sources(${EXECUTABLE_NAME} PRIVATE ${APP_RESOURCES})
-
-# Compiler flags per OS
-if(MSVC)
-    target_compile_options(${EXECUTABLE_NAME} PRIVATE /W4 /WX /analyze /sdl /guard:cf)
-elseif(APPLE)
-    target_compile_options(${EXECUTABLE_NAME} PRIVATE -Wall -Wextra -Wpedantic -Werror -Wshadow -Wconversion -Wsign-conversion -fsanitize=address,undefined -fstack-protector)
-    target_link_libraries(${EXECUTABLE_NAME} PRIVATE -fsanitize=address,undefined)
-    # set_target_properties(${EXECUTABLE_NAME} PROPERTIES MACOSX_BUNDLE TRUE)
-else()
-    target_compile_options(${EXECUTABLE_NAME} PRIVATE -Wall -Wextra -Wpedantic -Werror -Wshadow -Wconversion -Wsign-conversion -fsanitize=address,undefined -fstack-protector)
-    target_link_libraries(${EXECUTABLE_NAME} PRIVATE -fsanitize=address,undefined)
-endif()
-
-# Include directories
-target_include_directories(${EXECUTABLE_NAME} PRIVATE ${Qt${QT_MAJOR_VERSION}_INCLUDE_DIRS})
-target_include_directories(${EXECUTABLE_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/include)
-target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/include)
-
-# Set output names properly for Debug and Release
-set_target_properties(${EXECUTABLE_NAME} PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}"
-    DEBUG_OUTPUT_NAME "${EXECUTABLE_NAME}d"
-    RELEASE_OUTPUT_NAME ${EXECUTABLE_NAME}
-)
-
-# Link necessary Qt libraries to CodeAstra library
-target_link_libraries(${TARGET_NAME} PRIVATE Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Widgets)
-
-# Ensure correct linking of yaml-cpp (macOS)
-if(APPLE)
-    target_include_directories(${EXECUTABLE_NAME} PRIVATE /opt/homebrew/include)
-    target_link_directories(${EXECUTABLE_NAME} PRIVATE /opt/homebrew/lib)
-endif()