From 48b9f4e186facd338ba695ad0dfd9f32b3b0b1aa Mon Sep 17 00:00:00 2001 From: Bart Trojanowski Date: Wed, 24 Sep 2025 07:28:27 -0400 Subject: [PATCH] dependencies fix, check for GLM with pkg-config first --- Dependencies.cmake | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/Dependencies.cmake b/Dependencies.cmake index 9448942..b234928 100644 --- a/Dependencies.cmake +++ b/Dependencies.cmake @@ -40,8 +40,21 @@ endif() set_target_properties(glad PROPERTIES FOLDER "Dependencies") # GLM -find_package(glm 1.0.1 QUIET) -if (NOT glm_FOUND) +find_package(PkgConfig QUIET) +if (PKG_CONFIG_FOUND) + pkg_check_modules(GLM QUIET glm>=1.0.1) + if (GLM_FOUND) + message(STATUS "GLM found by pkg-config") + add_library(glm INTERFACE) + target_include_directories(glm INTERFACE ${GLM_INCLUDE_DIRS}) + endif() +else() + find_package(glm 1.0.1 QUIET) + if (glm_FOUND) + message(STATUS "GLM found by find_package") + endif() +endif() +if (NOT glm_FOUND AND NOT GLM_FOUND) FetchContent_Declare( glm DOWNLOAD_EXTRACT_TIMESTAMP OFF @@ -49,9 +62,12 @@ if (NOT glm_FOUND) ) FetchContent_GetProperties(glm) if (NOT glm_POPULATED) + message(STATUS "GLM found by FetchContent") set(FETCHCONTENT_QUIET NO) FetchContent_Populate(glm) - add_subdirectory(${glm_SOURCE_DIR} ${glm_BINARY_DIR}) + add_library(glm INTERFACE) + target_include_directories(glm INTERFACE ${glm_SOURCE_DIR}) endif() endif() -set_target_properties(glm PROPERTIES FOLDER "Dependencies") \ No newline at end of file + +set_target_properties(glm PROPERTIES FOLDER "Dependencies")