Skip to content

Commit

Permalink
Fix mistakenly overwritten builscripts
Browse files Browse the repository at this point in the history
  • Loading branch information
TheCurle committed Apr 7, 2024
1 parent 231f990 commit c4897c0
Showing 1 changed file with 7 additions and 42 deletions.
49 changes: 7 additions & 42 deletions projs/shadow/shadow-engine/assets/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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/
)

0 comments on commit c4897c0

Please sign in to comment.