From c4897c09e071b3abc4c4a4d59bcd360eb2dbea85 Mon Sep 17 00:00:00 2001 From: Curle Date: Sat, 6 Apr 2024 18:03:58 +0100 Subject: [PATCH] Fix mistakenly overwritten builscripts --- .../shadow-engine/assets/CMakeLists.txt | 49 +++---------------- 1 file changed, 7 insertions(+), 42 deletions(-) diff --git a/projs/shadow/shadow-engine/assets/CMakeLists.txt b/projs/shadow/shadow-engine/assets/CMakeLists.txt index 29725e3c..031da61c 100644 --- a/projs/shadow/shadow-engine/assets/CMakeLists.txt +++ b/projs/shadow/shadow-engine/assets/CMakeLists.txt @@ -1,44 +1,9 @@ -<<<<<<<< HEAD:projs/shadow/shadow-engine/shadow-file-format/CMakeLists.txt -set(CMAKE_CXX_STANDARD 20) -# Set up Catch2 testing -list(APPEND CMAKE_MODULE_PATH "cmake") -enable_testing() +FILE(GLOB_RECURSE SOURCES + ${CMAKE_CURRENT_LIST_DIR}/src/*.cpp + ) -# Set up asset sourceset -FILE(GLOB_RECURSE SOURCES src/*.cpp src/*.h) -FILE(GLOB_RECURSE TESTS test/*.cpp) - -add_library(shadow-asset ${SOURCES}) - -# Set up test executable -add_executable(shadow-asset-test ${TESTS}) -target_link_libraries(shadow-asset-test PRIVATE Catch2::Catch2 shadow-utils) - -# Enable testing on the executable -include(CTest) -include(Catch) -catch_discover_tests(shadow-asset-test) -======== -set(CMAKE_CXX_STANDARD 20) - -# Set up Catch2 testing -list(APPEND CMAKE_MODULE_PATH "cmake") -enable_testing() - -# Set up asset sourceset -FILE(GLOB_RECURSE SOURCES src/**.cpp src/**.h) -FILE(GLOB_RECURSE TESTS test/*.cpp) - -include_directories(src/) -add_library(shadow-asset ${SOURCES}) - -# Set up test executable -add_executable(shadow-asset-test ${TESTS}) -target_link_libraries(shadow-asset-test PRIVATE Catch2::Catch2 shadow-utils) - -# Enable testing on the executable -#include(CTest) -#include(Catch2) -#catch_discover_tests(shadow-asset-test) ->>>>>>>> 0009dc7 (File & FileSystem abstractions):projs/shadow/shadow-engine/assets/CMakeLists.txt +target_shadow_module(shadow-engine + SOURCES ${SOURCES} + INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/inc/ + ) \ No newline at end of file