The branch, master has been updated via ab2d90c Bump version to 1.1.3 via fca5220 cmake: Fix paths in pkgconfig and cmake config files from 6bfbb27 Bump version to 1.1.2
https://git.samba.org/?p=pam_wrapper.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit ab2d90c6def33888db86755e23f3c12d417e187f Author: Andreas Schneider <a...@samba.org> Date: Thu Mar 26 09:17:40 2020 +0100 Bump version to 1.1.3 Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Alexander Bokovoy <a...@samba.org> commit fca52209f62c83055edb5f3c9945cca705e1f713 Author: Andreas Schneider <a...@samba.org> Date: Wed Mar 25 13:11:00 2020 +0100 cmake: Fix paths in pkgconfig and cmake config files Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Alexander Bokovoy <a...@samba.org> ----------------------------------------------------------------------- Summary of changes: CHANGELOG | 3 +++ CMakeLists.txt | 2 +- libpamtest.pc.cmake | 2 +- pam_wrapper-config.cmake.in | 4 ++-- pam_wrapper.pc.cmake | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/CHANGELOG b/CHANGELOG index f72b8ad..39772b3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ ChangeLog ========== +version 1.1.3 (released 2020-03-26) + * Fixed paths in pkgconfig and cmake config files + version 1.1.2 (released 2020-03-24) * Fix manpage installation diff --git a/CMakeLists.txt b/CMakeLists.txt index a95e8f7..b453ec3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules") include(DefineCMakeDefaults) include(DefineCompilerFlags) -project(pam_wrapper VERSION 1.1.2 LANGUAGES C) +project(pam_wrapper VERSION 1.1.3 LANGUAGES C) # global needed variables set(APPLICATION_NAME ${PROJECT_NAME}) diff --git a/libpamtest.pc.cmake b/libpamtest.pc.cmake index 20758c7..6726d76 100644 --- a/libpamtest.pc.cmake +++ b/libpamtest.pc.cmake @@ -1,4 +1,4 @@ Name: libpamtest Description: A helper library for PAM testing Version: @APPLICATION_VERSION@ -Libs: @LIB_INSTALL_DIR@/libpamtest.so +Libs: @CMAKE_INSTALL_FULL_LIBDIR@/libpamtest.so diff --git a/pam_wrapper-config.cmake.in b/pam_wrapper-config.cmake.in index c93b661..d89e9a4 100644 --- a/pam_wrapper-config.cmake.in +++ b/pam_wrapper-config.cmake.in @@ -1,2 +1,2 @@ -set(PAM_WRAPPER_LIBRARY @CMAKE_INSTALL_LIBDIR@/@PAM_WRAPPER_LIB@) -set(PAM_WRAPPER_MODULE_DIR @CMAKE_INSTALL_LIBDIR@/@PROJECT_NAME@) +set(PAM_WRAPPER_LIBRARY @CMAKE_INSTALL_FULL_LIBDIR@/@PAM_WRAPPER_LIB@) +set(PAM_WRAPPER_MODULE_DIR @CMAKE_INSTALL_FULL_LIBDIR@/@PROJECT_NAME@) diff --git a/pam_wrapper.pc.cmake b/pam_wrapper.pc.cmake index 587a54c..7ebe607 100644 --- a/pam_wrapper.pc.cmake +++ b/pam_wrapper.pc.cmake @@ -1,6 +1,6 @@ -modules=@CMAKE_INSTALL_LIBDIR@/pam_wrapper +modules=@CMAKE_INSTALL_FULL_LIBDIR@/pam_wrapper Name: @PROJECT_NAME@ Description: The pam_wrapper library Version: @PROJECT_VERSION@ -Libs: @CMAKE_INSTALL_LIBDIR@/@PAM_WRAPPER_LIB@ +Libs: @CMAKE_INSTALL_FULL_LIBDIR@/@PAM_WRAPPER_LIB@ -- pam wrapper repository