'Generic Commit'

dropshell-tool/CMakeLists.txt

@@ -1,116 +1,44 @@
-# Get the current date in yyyy.mmdd.hhmm format
-execute_process(
-    COMMAND date "+%Y.%m%d.%H%M"
-    OUTPUT_VARIABLE PROJECT_VERSION
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+cmake_minimum_required(VERSION 3.16)
 
-cmake_minimum_required(VERSION 3.10)
-get_filename_component(PROJECT_EXE_NAME "${CMAKE_CURRENT_SOURCE_DIR}" NAME)
-project(${PROJECT_EXE_NAME} VERSION ${PROJECT_VERSION} LANGUAGES CXX)
-
-# Force static linking globally
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
-set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libraries" FORCE)
-set(CMAKE_POSITION_INDEPENDENT_CODE OFF)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static")
-set(ZLIB_USE_STATIC_LIBS "ON")
-set(OPENSSL_USE_STATIC_LIBS ON)
-
-set(CMAKE_CXX_STANDARD 23)
-set(CMAKE_C_STANDARD 23)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-# Set default build type to Release if not specified
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build (Debug or Release)" FORCE)
+# Project setup
+if(NOT DEFINED PROJECT_NAME)
+    message(FATAL_ERROR "PROJECT_NAME is not defined. Pass it via -DPROJECT_NAME=<name>")
 endif()
 
-# Configure build-specific compiler flags
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -DNDEBUG")
+string(TIMESTAMP PROJECT_VERSION "%Y.%m%d.%H%M")
+project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES CXX)
 
-# Configure version.hpp file
-configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/version.hpp.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/src/autogen/version.hpp"
-    @ONLY
-)
+# Build configuration
+set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_EXE_LINKER_FLAGS "-static")
+set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+set(BUILD_SHARED_LIBS OFF)
+set(CMAKE_PREFIX_PATH /usr/local)
 
-# Set CMAKE_MODULE_PATH to include our custom find modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-
-# Auto-detect source files
+# Create executable
 file(GLOB_RECURSE SOURCES "src/*.cpp")
-file(GLOB_RECURSE HEADERS "src/*.hpp")
-file(GLOB_RECURSE HEADERS "src/*.h")
+add_executable(${PROJECT_NAME} ${SOURCES})
 
-# Add custom target to run cmake_prebuild.sh at the start of the build process
-add_custom_target(run_prebuild_script ALL
-    COMMAND ${CMAKE_COMMAND} -E echo "Running cmake_prebuild.sh..."
-    COMMAND ${CMAKE_COMMAND} -E env bash ${CMAKE_CURRENT_SOURCE_DIR}/cmake_prebuild.sh
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-)
+# Configure version.hpp
+configure_file("src/version.hpp.in" "src/autogen/version.hpp" @ONLY)
 
-# Add executable
-add_executable(${PROJECT_EXE_NAME} ${SOURCES})
-add_dependencies(${PROJECT_EXE_NAME} run_prebuild_script)
+# Pre-build script
+add_custom_target(run_prebuild_script ALL 
+    COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/cmake_prebuild.sh
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+add_dependencies(${PROJECT_NAME} run_prebuild_script)
 
-# Set include directories
-# build dir goes first so that we can use the generated version.hpp
-target_include_directories(${PROJECT_EXE_NAME} PRIVATE 
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src/autogen>
-    ${CMAKE_CURRENT_SOURCE_DIR}/src
-)
+# Include directories
+target_include_directories(${PROJECT_NAME} PRIVATE 
+    ${CMAKE_CURRENT_BINARY_DIR}/src/autogen 
+    src)
 
-# Configure libassert
-include(FetchContent)
-FetchContent_Declare(
-  libassert
-  GIT_REPOSITORY https://github.com/jeremy-rifkin/libassert.git
-  GIT_TAG        v2.1.5
-)
-FetchContent_MakeAvailable(libassert)
-
-# Add cpptrace
-FetchContent_Declare(
-  cpptrace
-  GIT_REPOSITORY https://github.com/jeremy-rifkin/cpptrace.git
-  GIT_TAG        v0.8.3
-)
-FetchContent_MakeAvailable(cpptrace)
-
-# Add nlohmann/json
-FetchContent_Declare(
-  nlohmann_json
-  GIT_REPOSITORY https://github.com/nlohmann/json.git
-  GIT_TAG        v3.11.3
-)
-FetchContent_MakeAvailable(nlohmann_json)
+# Find packages
+find_package(nlohmann_json REQUIRED)
 
 # Link libraries
-target_link_libraries(${PROJECT_EXE_NAME} PRIVATE
-    libassert::assert
-    cpptrace::cpptrace
+target_link_libraries(${PROJECT_NAME} PRIVATE
     nlohmann_json::nlohmann_json
 )
-
-# Find OpenSSL (will use -DOPENSSL_ROOT_DIR etc. if set)
-find_package(OpenSSL REQUIRED)
-
-# Link OpenSSL imported targets if found
-if(TARGET OpenSSL::SSL AND TARGET OpenSSL::Crypto)
-    target_link_libraries(${PROJECT_EXE_NAME} PRIVATE
-        OpenSSL::SSL
-        OpenSSL::Crypto
-    )
-else()
-    message(FATAL_ERROR "OpenSSL targets not found. Set OPENSSL_ROOT_DIR and try again.")
-endif()
-
-# Set static linking flags
-set_target_properties(${PROJECT_EXE_NAME} PROPERTIES
-    LINK_FLAGS "-static"
-)
+