From 4984c652db2a5c3c8d21c7338f8ab4874dd0096a Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Wed, 18 Jun 2025 21:27:04 -0400 Subject: [PATCH] Fix .pc location when CMAKE_INSTALL_LIBDIR not set --- CMakeLists.txt | 3 +++ libarchive/CMakeLists.txt | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e938df72b..78c0a0dfb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 3.17 FATAL_ERROR) PROJECT(libarchive C) # +# Include standard installation directories +include(GNUInstallDirs) +# SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake") if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${libarchive_BINARY_DIR}/bin) diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt index fd997db41..82523a6f8 100644 --- a/libarchive/CMakeLists.txt +++ b/libarchive/CMakeLists.txt @@ -266,10 +266,6 @@ IF(NOT WIN32 OR CYGWIN OR NOT BUILD_SHARED_LIBS) SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive) ENDIF(NOT WIN32 OR CYGWIN OR NOT BUILD_SHARED_LIBS) -if(NOT DEFINED CMAKE_INSTALL_LIBDIR) - set(CMAKE_INSTALL_LIBDIR "lib") -endif() - IF(ENABLE_INSTALL) # How to install the libraries IF(BUILD_SHARED_LIBS) -- 2.47.2