Fix .pc location when CMAKE_INSTALL_LIBDIR not set

danyeaw · danyeaw · commit 4984c652db2a · 2025-06-18T21:27:04.000-04:00
diff --git 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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 3.17 FATAL_ERROR)`
`3`	`3`
`4`	`4`	`PROJECT(libarchive C)`
`5`	`5`	`#`
	`6`	`+# Include standard installation directories`
	`7`	`+include(GNUInstallDirs)`
	`8`	`+#`
`6`	`9`	`SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake")`
`7`	`10`	`if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)`
`8`	`11`	`set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${libarchive_BINARY_DIR}/bin)`