Install pkgconfig and cmake files into arch-dependent locations (#1055)

255bf1f9 · Timo Gurr · GitHub · 763b7d6c · 255bf1f9
Unverified Commit 255bf1f9 authored Sep 20, 2022 by Timo Gurr Committed by GitHub Sep 20, 2022
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

CMakeLists.txt CMakeLists.txt +2 -4

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,9 +142,7 @@ set_target_properties(yaml-cpp PROPERTIES
  PROJECT_LABEL "yaml-cpp ${yaml-cpp-label-postfix}"
  DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")

-# FIXME(felix2012): A more common place for the cmake export would be
-# `CMAKE_INSTALL_LIBDIR`, as e.g. done in ubuntu or in this project for GTest
-set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
+set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp")
 set(EXPORT_TARGETS yaml-cpp)
 configure_package_config_file(
  "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in"
@@ -175,7 +173,7 @@ if (YAML_CPP_INSTALL)
      "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
    DESTINATION "${CONFIG_EXPORT_DIR}")
  install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc"
-    DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 endif()
 unset(CONFIG_EXPORT_DIR)