From 76e7aad0903b332569143411dec9f94b86b566f1 Mon Sep 17 00:00:00 2001 From: jchristopherson Date: Thu, 22 Dec 2022 14:01:20 -0600 Subject: [PATCH] Fix find_package related bug in build scripts --- CMakeLists.txt | 2 +- cmake/helper.cmake | 2 +- dependencies/ferror/CMakeLists.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 46becbd..8881e35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # Master CMAKE Build Script -cmake_minimum_required(VERSION 3.17) +cmake_minimum_required(VERSION 3.24) project( linalg LANGUAGES Fortran C diff --git a/cmake/helper.cmake b/cmake/helper.cmake index ce2ea3e..7a560ce 100644 --- a/cmake/helper.cmake +++ b/cmake/helper.cmake @@ -60,7 +60,7 @@ endfunction() # Links the supplied library function(link_library targ lib include_dir) target_link_libraries(${targ} ${lib}) - target_include_directories(${targ} PUBLIC ${include_dir}) + target_include_directories(${targ} PUBLIC $) endfunction() # ------------------------------------------------------------------------------ diff --git a/dependencies/ferror/CMakeLists.txt b/dependencies/ferror/CMakeLists.txt index 171dbd0..8248895 100644 --- a/dependencies/ferror/CMakeLists.txt +++ b/dependencies/ferror/CMakeLists.txt @@ -17,6 +17,7 @@ else() FetchContent_Declare( ferror GIT_REPOSITORY "https://github.com/jchristopherson/ferror" + OVERRIDE_FIND_PACKAGE ) FetchContent_MakeAvailable(ferror)