[SCM] NSS Wrapper Repository - branch master updated
Andreas Schneider
asn at samba.org
Tue Feb 4 09:00:09 MST 2014
The branch, master has been updated
via 3d58327 Bump version to 1.0.1.
via fb29d2d cmake: Add nss_wrapper-config.cmake.
via 37a7c67 cmake: Use NSS_WRAPPER_LOCATION.
via 9aeb8ae cmake: Add --libs output for pkg-config.
via 3369dd7 cpack: Don't package the obj directory.
from bb1f815 src: Remove the localhost shortcut.
http://gitweb.samba.org/?p=nss_wrapper.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3d58327513c6bc7bbb3949cf27c5efdaafe22d69
Author: Andreas Schneider <asn at samba.org>
Date: Tue Feb 4 12:24:44 2014 +0100
Bump version to 1.0.1.
commit fb29d2ddd2cf363c30cff1ce01790d25e1dfc5ae
Author: Andreas Schneider <asn at samba.org>
Date: Tue Feb 4 12:23:37 2014 +0100
cmake: Add nss_wrapper-config.cmake.
commit 37a7c67728600e0947537610da7232e992844b7a
Author: Andreas Schneider <asn at samba.org>
Date: Tue Feb 4 12:41:26 2014 +0100
cmake: Use NSS_WRAPPER_LOCATION.
commit 9aeb8aef5df4a4e14c55134e60c069156da4b8fc
Author: Andreas Schneider <asn at samba.org>
Date: Tue Feb 4 12:22:37 2014 +0100
cmake: Add --libs output for pkg-config.
commit 3369dd74aa826954c8f8d34d2220a83f387707dc
Author: Andreas Schneider <asn at samba.org>
Date: Tue Feb 4 12:19:18 2014 +0100
cpack: Don't package the obj directory.
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 17 +++++++++++------
CPackConfig.cmake | 2 +-
ChangeLog | 5 +++++
nss_wrapper-config.cmake.in | 1 +
nss_wrapper.pc.cmake | 1 +
src/CMakeLists.txt | 4 ++++
tests/CMakeLists.txt | 2 +-
7 files changed, 24 insertions(+), 8 deletions(-)
create mode 100644 nss_wrapper-config.cmake.in
Changeset truncated at 500 lines:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8359849..a83fb75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(APPLICATION_NAME ${PROJECT_NAME})
set(APPLICATION_VERSION_MAJOR "1")
set(APPLICATION_VERSION_MINOR "0")
-set(APPLICATION_VERSION_PATCH "0")
+set(APPLICATION_VERSION_PATCH "1")
set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}")
@@ -56,7 +56,15 @@ install(
DESTINATION
${BIN_INSTALL_DIR})
+if (UNIT_TESTING)
+ find_package(CMocka REQUIRED)
+ include(AddCMockaTest)
+ add_subdirectory(tests)
+endif (UNIT_TESTING)
+
# pkg-config file
+get_filename_component(NSS_WRAPPER_LIB ${NSS_WRAPPER_LOCATION} NAME)
+
configure_file(nss_wrapper.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/nss_wrapper.pc @ONLY)
install(
FILES
@@ -69,17 +77,14 @@ install(
# cmake config files
configure_file(nss_wrapper-config-version.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/nss_wrapper-config-version.cmake @ONLY)
+configure_file(nss_wrapper-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/nss_wrapper-config.cmake @ONLY)
install(
FILES
${CMAKE_CURRENT_BINARY_DIR}/nss_wrapper-config-version.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/nss_wrapper-config.cmake
DESTINATION
${CMAKE_INSTALL_DIR}
COMPONENT
devel
)
-if (UNIT_TESTING)
- find_package(CMocka REQUIRED)
- include(AddCMockaTest)
- add_subdirectory(tests)
-endif (UNIT_TESTING)
diff --git a/CPackConfig.cmake b/CPackConfig.cmake
index e5d1ce8..dc74dfa 100644
--- a/CPackConfig.cmake
+++ b/CPackConfig.cmake
@@ -19,7 +19,7 @@ set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSIO
### source generator
set(CPACK_SOURCE_GENERATOR "TGZ")
-set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build/;tags;cscope.*")
+set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build/;/obj/;tags;cscope.*")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
if (WIN32)
diff --git a/ChangeLog b/ChangeLog
index d2f5d4e..d3307aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
ChangeLog
==========
+version 1.0.1 (released 2014-02-04)
+ * Added --libs to pkg-config.
+ * Added nss_wrapper-config.cmake
+ * Fixed a bug packaging the obj directory.
+
version 1.0.0 (released 2014-02-02)
* Initial release
diff --git a/nss_wrapper-config.cmake.in b/nss_wrapper-config.cmake.in
new file mode 100644
index 0000000..ccf7113
--- /dev/null
+++ b/nss_wrapper-config.cmake.in
@@ -0,0 +1 @@
+set(NSS_WRAPPER_LIRBARY @LIB_INSTALL_DIR@/@NSS_WRAPPER_LIB@)
diff --git a/nss_wrapper.pc.cmake b/nss_wrapper.pc.cmake
index 6fb8ff2..9fca0f8 100644
--- a/nss_wrapper.pc.cmake
+++ b/nss_wrapper.pc.cmake
@@ -1,3 +1,4 @@
Name: @APPLICATION_NAME@
Description: The nss_wrapper library
Version: @APPLICATION_VERSION@
+Libs: @LIB_INSTALL_DIR@/@NSS_WRAPPER_LIB@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b2c5012..089070a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,3 +20,7 @@ install(
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
)
+
+# This needs to be at the end
+get_target_property(NWRAP_LOCATION nss_wrapper LOCATION)
+set(NSS_WRAPPER_LOCATION ${NWRAP_LOCATION} PARENT_SCOPE)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d73ec2f..3b84829 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -16,7 +16,7 @@ configure_file(passwd.in ${CMAKE_CURRENT_BINARY_DIR}/passwd @ONLY)
configure_file(group.in ${CMAKE_CURRENT_BINARY_DIR}/group @ONLY)
configure_file(hosts.in ${CMAKE_CURRENT_BINARY_DIR}/hosts @ONLY)
-set(TEST_ENVIRONMENT LD_PRELOAD=${CMAKE_BINARY_DIR}/src/libnss_wrapper.so)
+set(TEST_ENVIRONMENT LD_PRELOAD=${NSS_WRAPPER_LOCATION})
list(APPEND TEST_ENVIRONMENT NSS_WRAPPER_PASSWD=${CMAKE_CURRENT_BINARY_DIR}/passwd)
list(APPEND TEST_ENVIRONMENT NSS_WRAPPER_GROUP=${CMAKE_CURRENT_BINARY_DIR}/group)
list(APPEND TEST_ENVIRONMENT NSS_WRAPPER_HOSTS=${CMAKE_CURRENT_BINARY_DIR}/hosts)
--
NSS Wrapper Repository
More information about the samba-cvs
mailing list