Skip to content

Commit 2da6f58

Browse files
author
Jonas Heinle
committed
fix
1 parent 3c67678 commit 2da6f58

File tree

3 files changed

+7
-15
lines changed

3 files changed

+7
-15
lines changed

CMakeLists.txt

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,14 @@ myproject_global_options()
2121

2222
myproject_local_options()
2323

24-
include(cmake/Doxygen.cmake)
25-
enable_doxygen()
26-
27-
include(cmake/Speedup.cmake)
28-
29-
add_subdirectory(ExternalLib)
30-
3124
# we depend on vulkan
3225
find_package(Vulkan REQUIRED)
3326
# configure vulkan version
3427
set(VULKAN_VERSION_MAJOR 1)
3528
set(VULKAN_VERSION_MINOR 3)
3629
find_package(Threads REQUIRED)
3730

38-
# # so we can compile our shaders on the fly later on
39-
# add_compile_definitions(GLSLC_EXE="${Vulkan_GLSLC_EXECUTABLE}" )
40-
# # remove dirty file directories ...
41-
# add_compile_definitions(CMAKELISTS_DIR="${CMAKE_CURRENT_SOURCE_DIR}" )
42-
43-
# https://stackoverflow.com/questions/1027247/is-it-better-to-specify-source-files-with-glob-or-each-file-individually-in-cmak
44-
# https://stackoverflow.com/questions/45090926/cmake-generate-list-of-source-files-without-glob
45-
# lets remove the FILE GLOB ... it is bad (as stated in the docs ... https://cmake.org/cmake/help/latest/command/file.html)
31+
add_subdirectory(ExternalLib)
4632

4733
# update current positions
4834
set(PROJECT_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Src/)

ExternalLib/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
include(FetchContent)
2+
23
# include google test to project
34
FetchContent_Declare(
45
googletest

cmake/ProjectOptions.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,4 +214,9 @@ macro(myproject_local_options)
214214
myproject_enable_hardening(myproject_options OFF ${ENABLE_UBSAN_MINIMAL_RUNTIME})
215215
endif()
216216

217+
include(cmake/Doxygen.cmake)
218+
enable_doxygen()
219+
220+
include(cmake/Speedup.cmake)
221+
217222
endmacro()

0 commit comments

Comments
 (0)