From b1bcdecbac2a41de3941ef5a34faa6fbe4472535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Thu, 23 Nov 2023 14:45:54 -0500 Subject: [PATCH] cmake: use pkg-config in static mode Change-Id: I8732dfaab77bc147763b7591d88e8ca476566627 --- CMakeLists.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bc7e97..bddd5b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,21 +23,23 @@ option(BUILD_BENCHMARKS "Build benchamrks" ON) option(BUILD_DEPENDENCIES "Build dependencies" ON) if (NOT MSVC) + set(DEPENDENCIES_PATH ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/install/${TARGET}) + message("dependencies path: ${DEPENDENCIES_PATH}") if (BUILD_DEPENDENCIES) find_package(Python3 COMPONENTS Interpreter) execute_process( COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/build.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies ) - set(DEPENDENCIES_PATH ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/install/${TARGET}) - include (GNUInstallDirs) - message("dependencies path: ${DEPENDENCIES_PATH}") - list(APPEND CMAKE_FIND_ROOT_PATH ${DEPENDENCIES_PATH}) - set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH) - list(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_PATH}) endif() - + include (GNUInstallDirs) + list(APPEND CMAKE_FIND_ROOT_PATH ${DEPENDENCIES_PATH}) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH) + list(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_PATH}) find_package (PkgConfig REQUIRED) + if(BUILD_STATIC) + list(APPEND PKG_CONFIG_EXECUTABLE "--static") + endif() check_include_file_cxx(msgpack.hpp HAVE_MSGPACKCXX) if (NOT HAVE_MSGPACKCXX) -- GitLab