Merge pull request #11 from monkey0722/update/settings

feat: Enhance CMake and build scripts with improved configuration

Author: monkey0722

CMakeLists.txt

@@ -4,41 +4,56 @@ project(CLAVIS LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 
-# Collect Source Files
+# Set build type (default is Debug)
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Debug)
+endif()
+
+# Basic compiler flags
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
+endif()
+
+# Collect source files
 file(GLOB CORE_SOURCES
   src/*.cpp
   src/graph/*.hpp
   src/data_structure/*.hpp
   src/sorting/*.hpp
 )
 
-# Collect Test Files
+# Collect test files
 file(GLOB TEST_SOURCES
   tests/*.cpp
   tests/graph/*.cpp
   tests/data_structure/*.cpp
   tests/sorting/*.cpp
 )
 
-# Integrate All Sources
+# Combine all sources
 set(SOURCES ${CORE_SOURCES})
 
-# Create Library
+# Create library
 add_library(clavis_algorithm ${SOURCES})
 
-# Google Test Setup
+# Set include directories
+target_include_directories(clavis_algorithm PUBLIC
+  ${CMAKE_SOURCE_DIR}/src
+)
+
+# Google Test configuration
 find_package(GTest REQUIRED)
 enable_testing()
 
-# Test Execution File
+# Test executable
 add_executable(clavis_algorithm_test ${TEST_SOURCES})
 
-# Include Directories
+# Set include directories for tests
 target_include_directories(clavis_algorithm_test PRIVATE
   ${CMAKE_SOURCE_DIR}/src
 )
 
 target_link_libraries(clavis_algorithm_test clavis_algorithm GTest::GTest GTest::Main)
 
-# Register Test
+# Register test
 add_test(NAME AlgorithmTest COMMAND clavis_algorithm_test)

scripts/build_debug.sh

@@ -8,22 +8,24 @@ print_usage() {
   echo "Options:"
   echo "  -c, --clean     Remove old executable before building"
   echo "  -r, --run       Run program after building" 
+  echo "  -j, --jobs N    Compile with N parallel jobs (default: all cores)"
   echo "  -h, --help      Show this help message"
   echo ""
   echo "Example: $0 sort.cpp -r"
 }
 
-# Set default values 
+# Set default values
 CLEAN_MODE=0
 RUN_AFTER_BUILD=0
+NUM_JOBS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 2)
 
 # Create build directory
 BUILD_DIR="build"
 if [ ! -d "$BUILD_DIR" ]; then
   mkdir -p "$BUILD_DIR"
 fi
 
-# Show usage if no arguments
+# Show help if no arguments
 if [ $# -eq 0 ]; then
   print_usage
   exit 1
@@ -45,6 +47,14 @@ case "$1" in
   -r|--run)
     RUN_AFTER_BUILD=1
     ;;
+  -j|--jobs)
+    if [[ $2 =~ ^[0-9]+$ ]]; then
+      NUM_JOBS=$2
+      shift
+    else
+      NUM_JOBS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 2)
+    fi
+    ;;
   -h|--help)
     print_usage
     exit 0
@@ -66,12 +76,18 @@ fi
 
 # Run debug build
 echo "Building in debug mode..."
-g++ -std=c++20 -DDEBUG_LOG -g "$SOURCE_FILE" -o "$OUTPUT_FILE"
+g++ -std=c++20 -DDEBUG_LOG -g -Wall -Wextra "$SOURCE_FILE" -o "$OUTPUT_FILE"
 
-echo "Build complete: $OUTPUT_FILE"
+# Check build result
+if [ $? -eq 0 ]; then
+  echo "Build complete: $OUTPUT_FILE"
 
-# Run after build if requested
-if [ $RUN_AFTER_BUILD -eq 1 ]; then
-  echo "Running program..."
-  "$OUTPUT_FILE"
+  # Run after build (if requested)
+  if [ $RUN_AFTER_BUILD -eq 1 ]; then
+    echo "Running program..."
+    "$OUTPUT_FILE"
+  fi
+else
+  echo "Build failed."
+  exit 1
 fi

scripts/run_tests.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
-set -eux
+set -e  # Exit immediately if a command exits with a non-zero status
 
-# Create build directory if it doesn't exist
+# Create build directory (if it doesn't exist)
 if [ ! -d "build" ]; then
   mkdir build
 fi
@@ -14,8 +14,9 @@ cmake -DCMAKE_BUILD_TYPE=Debug \
       -DCMAKE_CXX_STANDARD_REQUIRED=ON \
       ..
 
-# Build
-cmake --build . -- -j"$(nproc)"
+# Build (using parallel build)
+JOBS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 2)
+cmake --build . -- -j"$JOBS"
 
-# Run tests via CTest
+# Run tests
 GTEST_COLOR=1 ctest --verbose --output-on-failure