Skip to content

Commit c4897c0

Browse files
committed
Fix mistakenly overwritten builscripts
1 parent 231f990 commit c4897c0

1 file changed

Lines changed: 7 additions & 42 deletions

File tree

Lines changed: 7 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,9 @@
1-
<<<<<<<< HEAD:projs/shadow/shadow-engine/shadow-file-format/CMakeLists.txt
2-
set(CMAKE_CXX_STANDARD 20)
31

4-
# Set up Catch2 testing
5-
list(APPEND CMAKE_MODULE_PATH "cmake")
6-
enable_testing()
2+
FILE(GLOB_RECURSE SOURCES
3+
${CMAKE_CURRENT_LIST_DIR}/src/*.cpp
4+
)
75

8-
# Set up asset sourceset
9-
FILE(GLOB_RECURSE SOURCES src/*.cpp src/*.h)
10-
FILE(GLOB_RECURSE TESTS test/*.cpp)
11-
12-
add_library(shadow-asset ${SOURCES})
13-
14-
# Set up test executable
15-
add_executable(shadow-asset-test ${TESTS})
16-
target_link_libraries(shadow-asset-test PRIVATE Catch2::Catch2 shadow-utils)
17-
18-
# Enable testing on the executable
19-
include(CTest)
20-
include(Catch)
21-
catch_discover_tests(shadow-asset-test)
22-
========
23-
set(CMAKE_CXX_STANDARD 20)
24-
25-
# Set up Catch2 testing
26-
list(APPEND CMAKE_MODULE_PATH "cmake")
27-
enable_testing()
28-
29-
# Set up asset sourceset
30-
FILE(GLOB_RECURSE SOURCES src/**.cpp src/**.h)
31-
FILE(GLOB_RECURSE TESTS test/*.cpp)
32-
33-
include_directories(src/)
34-
add_library(shadow-asset ${SOURCES})
35-
36-
# Set up test executable
37-
add_executable(shadow-asset-test ${TESTS})
38-
target_link_libraries(shadow-asset-test PRIVATE Catch2::Catch2 shadow-utils)
39-
40-
# Enable testing on the executable
41-
#include(CTest)
42-
#include(Catch2)
43-
#catch_discover_tests(shadow-asset-test)
44-
>>>>>>>> 0009dc7 (File & FileSystem abstractions):projs/shadow/shadow-engine/assets/CMakeLists.txt
6+
target_shadow_module(shadow-engine
7+
SOURCES ${SOURCES}
8+
INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/inc/
9+
)

0 commit comments

Comments
 (0)