From 37194dbecde9c96062069ce0f8ea43d2216bc0aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20V=C3=A1zquez=20Blanco?= Date: Mon, 5 Jun 2023 08:23:10 +0200 Subject: [PATCH 1/2] Treat MSYS CMake installation paths as Unix --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b9dd1c99..7eff102e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,7 +108,7 @@ find_package(SoapySDR CONFIG REQUIRED) # Install cmake helper modules ######################################################################## include(CMakePackageConfigHelpers) -if (UNIX) +if (UNIX OR MSYS) set(CMAKE_LIB_DEST ${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}) elseif (WIN32) set(CMAKE_LIB_DEST cmake) From 4ee947883d7e26b7ec0a0e7e83ecc192eff8443c Mon Sep 17 00:00:00 2001 From: Luiz Ribeiro Date: Sun, 24 Jul 2022 14:03:22 -0500 Subject: [PATCH 2/2] pkg-config: Use cmake full paths (fixes #352) --- lib/SoapySDR.in.pc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/SoapySDR.in.pc b/lib/SoapySDR.in.pc index a1ca6989..fd2f4c0c 100644 --- a/lib/SoapySDR.in.pc +++ b/lib/SoapySDR.in.pc @@ -1,7 +1,5 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=${prefix} -libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ Name: Soapy SDR Description: Vendor and platform neutral SDR interface library.