mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-06 01:08:44 +00:00
47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
From e0b1ad02c678513412aba95a1b2fb4005c3c0452 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Sat, 19 Mar 2022 22:40:49 -0700
|
|
Subject: [PATCH] cmake: Use GNUInstallDirs
|
|
|
|
This helps it make it platform independent, some platforms e.g.
|
|
ppc64/linux use /usr/lib64 for system libraries
|
|
|
|
Upstream-Status: Submitted [https://github.com/pboettch/json-schema-validator/pull/197]
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
CMakeLists.txt | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index c4cc218..594dc5f 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -122,11 +122,13 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
|
endif()
|
|
endif()
|
|
|
|
+include(GNUInstallDirs)
|
|
+
|
|
if(JSON_VALIDATOR_INSTALL)
|
|
install(TARGETS nlohmann_json_schema_validator
|
|
EXPORT ${PROJECT_NAME}Targets
|
|
- LIBRARY DESTINATION lib
|
|
- ARCHIVE DESTINATION lib
|
|
+ LIBRARY DESTINATION ${LIBDIR}
|
|
+ ARCHIVE DESTINATION ${LIBDIR}
|
|
RUNTIME DESTINATION bin)
|
|
|
|
install(FILES src/nlohmann/json-schema.hpp
|
|
@@ -155,7 +157,7 @@ if(JSON_VALIDATOR_INSTALL)
|
|
# Set Up the Project Targets and Config Files for CMake
|
|
|
|
# Set the install path to the cmake config files
|
|
- set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_PREFIX}/lib/cmake/${PROJECT_NAME})
|
|
+ set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
|
|
|
|
# Create the ConfigVersion file
|
|
include(CMakePackageConfigHelpers) # write_basic_package_version_file
|
|
--
|
|
2.35.1
|
|
|