From dc6f12a95a0be01ab884cf7fbefd7bb969d605a4 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sat, 23 Sep 2023 14:57:56 -0400 Subject: [PATCH] Use even less FetchContent! --- CMakeLists.txt | 2 ++ renderer/CMakeLists.txt | 12 +----------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4543a32..45a8bf5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,8 @@ set(CMAKE_CXX_STANDARD 17) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) find_package(Qt5 COMPONENTS Core Widgets Concurrent CONFIG REQUIRED) +find_package(Vulkan REQUIRED) +find_package(glm REQUIRED) include(FetchContent) diff --git a/renderer/CMakeLists.txt b/renderer/CMakeLists.txt index e7fed0a..094dca3 100644 --- a/renderer/CMakeLists.txt +++ b/renderer/CMakeLists.txt @@ -1,16 +1,6 @@ # SPDX-FileCopyrightText: 2023 Joshua Goins # SPDX-License-Identifier: CC0-1.0 -find_package(Vulkan REQUIRED) - -FetchContent_Declare( - glm - GIT_REPOSITORY https://github.com/g-truc/glm.git - GIT_TAG 0.9.9.8 -) - -FetchContent_MakeAvailable(glm) - if(USE_STANDALONE_WINDOW) find_package(SDL2 REQUIRED) set(EXTRA_SRC src/standalonewindow.cpp) @@ -19,7 +9,7 @@ endif() add_library(renderer src/renderer.cpp ${EXTRA_SRC}) target_include_directories(renderer PUBLIC include) -target_link_libraries(renderer PUBLIC Qt5::Core Vulkan::Vulkan physis z ${EXTRA_LIBRARIES}) +target_link_libraries(renderer PUBLIC Qt5::Core Vulkan::Vulkan physis z glm::glm ${EXTRA_LIBRARIES}) target_compile_definitions(renderer PUBLIC GLM_FORCE_RADIANS GLM_FORCE_DEPTH_ZERO_TO_ONE) if(USE_STANDALONE_WINDOW)