From 11a70712800e66fb13233b98e6cd2d81c98ff4d7 Mon Sep 17 00:00:00 2001 From: kj16609 Date: Thu, 7 Nov 2024 17:50:18 -0500 Subject: [PATCH] Fixes some module fuckery --- CMakeLists.txt | 2 +- modules/helpers.cmake | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a2dc97..94c8705 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.20) #set(CMAKE_CXX_STANDARD 23) #set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/modules" ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/modules") include(common) diff --git a/modules/helpers.cmake b/modules/helpers.cmake index 5d21700..57b963c 100644 --- a/modules/helpers.cmake +++ b/modules/helpers.cmake @@ -13,9 +13,11 @@ function(PostSetup) endfunction() function(AddFGLExecutable NAME SRC_SOURCES_LOCATION) - file(GLOB_RECURSE CPP_SOURCES ${SRC_SOURCES_LOCATION}/**.cpp) - file(GLOB_RECURSE HPP_SOURCES ${SRC_SOURCES_LOCATION}/**.hpp) - add_executable(${NAME} ${CPP_SOURCES} ${HPP_SOURCES}) + file(GLOB_RECURSE SOURCES + ${SRC_SOURCES_LOCATION}/**.cpp + ${SRC_SOURCES_LOCATION}/**.hpp + ) + add_executable(${NAME} ${SOURCES}) target_include_directories(${NAME} PRIVATE ${SRC_SOURCES_LOCATION}) set_target_properties(${NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") SetFGLFlags(${NAME})