Skip to content

Commit 410fc31

Browse files
Merge branch 'develop' into user/kernel/fix-command-buffer-manager
2 parents 3108d84 + d037c83 commit 410fc31

3 files changed

Lines changed: 15 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,16 @@ list( APPEND CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib )
4040
#
4141
if (NOT LAUNCHER_ONLY)
4242

43-
## Setup Dependencies
44-
include(dependencies.cmake)
43+
# Enable CMake's CTest Functionality
44+
#
45+
include(CTest)
4546

46-
## Compile Shaders
47+
# Setup Dependencies
48+
#
49+
include(dependencies.cmake)
4750

51+
# Compile Shaders
52+
#
4853
add_subdirectory (Resources)
4954

5055
# Core engine lib is here

ZEngine/tests/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,8 @@ set_target_properties(ZEngineTests PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREF
1717

1818
install(TARGETS ZEngineTests
1919
RUNTIME DESTINATION tests)
20+
21+
if(BUILD_TESTING)
22+
include(GoogleTest)
23+
gtest_discover_tests(ZEngineTests)
24+
endif()

dependencies.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ FetchContent_Declare(
44
fmt
55
GIT_REPOSITORY https://github.com/fmtlib/fmt.git
66
GIT_SHALLOW TRUE
7-
)
7+
GIT_TAG main
8+
)
89

910
FetchContent_Declare(
1011
imgui

0 commit comments

Comments
 (0)