generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-16 18:56:54 +02:00
Code Issues Projects Releases Wiki Activity

Install version/config files under CMAKE_INSTALL_LIBDIR

Browse Source 
Prior to the c_master/cpp_master split, this is where the files were
installed (c.f., 6e7deb8091/CMakeLists.txt (L454))
but this was changed to use "lib/" directly when updating the C++-only
packaging.

Re-instate the use of CMAKE_INSTALL_LIBDIR so the user can control where
they are installed and they follow the typical convention for location.
This commit is contained in:
James McCoy
2022-02-13 16:41:07 -05:00
parent b350a00f6b
commit b4d800e6e4
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -191,6 +191,8 @@ IF (MSGPACK_BUILD_DOCS)
ENDIF () ENDIF ()
ENDIF () ENDIF ()
include (GNUInstallDirs)
# Install library. # Install library.
INSTALL (TARGETS msgpackc-cxx INSTALL (TARGETS msgpackc-cxx
EXPORT msgpackc-cxx-targets EXPORT msgpackc-cxx-targets
@@ -211,7 +213,7 @@ INCLUDE (CMakePackageConfigHelpers)
IF (NOT (CMAKE_VERSION VERSION_LESS 3.14)) IF (NOT (CMAKE_VERSION VERSION_LESS 3.14))
SET (extra_version_file_args ARCH_INDEPENDENT) SET (extra_version_file_args ARCH_INDEPENDENT)
ENDIF () ENDIF ()
SET (cmake_config_path "lib/cmake/msgpackc-cxx") SET (cmake_config_path "${CMAKE_INSTALL_LIBDIR}/cmake/msgpackc-cxx")
# Configure the main package file from source tree. # Configure the main package file from source tree.
CONFIGURE_PACKAGE_CONFIG_FILE ( CONFIGURE_PACKAGE_CONFIG_FILE (