From cfad331471d1186fe83cd11c267495e37cf97f58 Mon Sep 17 00:00:00 2001 From: Daniel Scharrer <~@ds.me> Date: Tue, 31 Dec 2024 02:58:38 +0100 Subject: [PATCH] CMake: Fix Boost static dependencies check --- CMakeLists.txt | 5 ----- cmake/UseStaticLibs.cmake | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3701504..d4c133b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,5 @@ cmake_minimum_required(VERSION 2.8...3.31) -# CMake 30 -if(POLICY CMP0167) - cmake_policy(SET CMP0167 OLD) -endif() - if(CMAKE_VERSION VERSION_LESS 3.12) cmake_policy(VERSION ${CMAKE_VERSION}) endif() diff --git a/cmake/UseStaticLibs.cmake b/cmake/UseStaticLibs.cmake index 844b85c..35004b8 100644 --- a/cmake/UseStaticLibs.cmake +++ b/cmake/UseStaticLibs.cmake @@ -52,6 +52,13 @@ macro(has_static_libs PREFIX LIBS) else() set(${PREFIX}_HAS_STATIC_LIBS 0) foreach(lib IN LISTS ${LIBS}) + if(TARGET ${lib}) + get_target_property(target_type ${lib} TYPE) + if(target_type STREQUAL STATIC_LIBRARY) + set(${PREFIX}_HAS_STATIC_LIBS 1) + break() + endif() + endif() if(lib MATCHES "\\.a$") set(${PREFIX}_HAS_STATIC_LIBS 1) break()