diff options
| author | Leon Kang <2090093273@qq.com> | 2024-10-03 21:04:37 -0700 |
|---|---|---|
| committer | Leon Kang <2090093273@qq.com> | 2024-10-03 21:04:37 -0700 |
| commit | 1f47c662a07ec83d4033b1a5f4b48dd8dfa58b7b (patch) | |
| tree | cfb8941b80d1bc672bf25dba3ca716a1e0bc0823 /CMakeLists.txt | |
| parent | c1ceb18d1c6d8af1266fc9cb9233e2328dd4d723 (diff) | |
| parent | e59529d3f55b9128f798a7f02a7288f96bdaf9a4 (diff) | |
| download | iris-1f47c662a07ec83d4033b1a5f4b48dd8dfa58b7b.tar.gz iris-1f47c662a07ec83d4033b1a5f4b48dd8dfa58b7b.zip | |
Merge branch 'main' into windows-build
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b2dc213..ad7fd44 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,9 +8,6 @@ set(CMAKE_CXX_STANDARD 20) set(PROJECT_ROOT ${CMAKE_SOURCE_DIR}) set(SRC_DIR ${PROJECT_ROOT}/src) set(EXT_DIR ${PROJECT_ROOT}/ext) -if (CMAKE_BUILD_TYPE STREQUAL "Debug") - add_compile_definitions(USE_VULKAN_VALIDATION_LAYERS) -endif() # Add external libraries include(${EXT_DIR}/imgui.cmake) @@ -19,7 +16,7 @@ add_library(argparse INTERFACE) target_include_directories(argparse INTERFACE ${EXT_DIR}/argparse/include) add_library(tinygltf INTERFACE) -target_include_directories(tinygltf INTERFACE ${EXT_DIR}/tinygltf) +target_include_directories(tinygltf INTERFACE ${EXT_DIR}/tinygltf.git) add_library(tinyobjloader INTERFACE) target_include_directories(tinyobjloader INTERFACE ${EXT_DIR}/tinyobjloader) @@ -32,6 +29,13 @@ file(GLOB_RECURSE SOURCES "${SRC_DIR}/*.cpp") # Add executable from your source files add_executable(iris_renderer ${SOURCES}) +if (CMAKE_BUILD_TYPE STREQUAL "Debug") + add_compile_definitions(USE_VULKAN_VALIDATION_LAYERS) +endif() + +add_subdirectory(${EXT_DIR}/glm) +target_link_libraries(iris_renderer PRIVATE glm::glm) + find_package(glfw3 REQUIRED) target_link_libraries(iris_renderer PRIVATE glfw) @@ -41,6 +45,9 @@ target_link_libraries(iris_renderer PRIVATE Vulkan::Vulkan) find_package(VulkanMemoryAllocator CONFIG REQUIRED) target_link_libraries(iris_renderer PRIVATE GPUOpen::VulkanMemoryAllocator) +find_package(spdlog REQUIRED) +target_link_libraries(iris_renderer PRIVATE spdlog::spdlog) + # Link external libraries to your project target_link_libraries(iris_renderer PRIVATE argparse imgui tinygltf tinyobjloader stb |