From f91466d2e620724afeaaa2e1666495a0ab0b1e5e Mon Sep 17 00:00:00 2001 From: "K.Kosako" Date: Mon, 25 Jul 2022 21:45:52 +0900 Subject: [PATCH] fix: #266: Incorrect libdir path when built with prefix --- CMakeLists.txt | 6 ++++++ onig-config.cmake.in | 2 +- oniguruma.pc.cmake.in | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 43b7d42..03e068d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,6 +166,12 @@ configure_package_config_file( INSTALL_DESTINATION "${config_install_dir}" ) +if(CMAKE_INSTALL_LIBDIR MATCHES "^/") + set(onig_pkgconfig_libdir "${CMAKE_INSTALL_LIBDIR}") +else() + set(onig_pkgconfig_libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") +endif() + # Targets: # * /lib*/libonig.a # * header location after install: /include/ diff --git a/onig-config.cmake.in b/onig-config.cmake.in index 108194e..0a8a702 100644 --- a/onig-config.cmake.in +++ b/onig-config.cmake.in @@ -29,7 +29,7 @@ fi prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +libdir=@onig_pkgconfig_libdir@ includedir=${prefix}/include is_set_exec_prefix=no diff --git a/oniguruma.pc.cmake.in b/oniguruma.pc.cmake.in index fca6772..cb5b959 100644 --- a/oniguruma.pc.cmake.in +++ b/oniguruma.pc.cmake.in @@ -1,6 +1,6 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +libdir=@onig_pkgconfig_libdir@ includedir=${prefix}/include datarootdir=${prefix}/share datadir=${prefix}/share