[SCM] UID Wrapper Repository - branch master updated
Andreas Schneider
asn at samba.org
Tue Feb 4 08:32:09 MST 2014
The branch, master has been updated
via 0ea952c Bump version to 1.0.1.
via 1963913 cmake: Add uid_wrapper-config.cmake.
via ef1ff0c cmake: Use UID_WRAPPER_LOCATION.
via 80bc81c cmake: Add --libs output for pkg-config.
via 277d719 cpack: Don't package the obj directory.
via fe8d6b2 tests: Use bool in the prototype too.
from 2fea9dc tests: Use a bool for the test_uwrap_enabled test.
http://gitweb.samba.org/?p=uid_wrapper.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0ea952cce266f684272f5855209998762c3d80d4
Author: Andreas Schneider <asn at samba.org>
Date: Tue Feb 4 12:39:33 2014 +0100
Bump version to 1.0.1.
commit 1963913a597fbcebd61a910775d1aba1cf3cfc36
Author: Andreas Schneider <asn at samba.org>
Date: Tue Feb 4 12:37:30 2014 +0100
cmake: Add uid_wrapper-config.cmake.
commit ef1ff0c0c04324913d3d49b9dbce026033d46bea
Author: Andreas Schneider <asn at samba.org>
Date: Tue Feb 4 12:35:11 2014 +0100
cmake: Use UID_WRAPPER_LOCATION.
commit 80bc81c45731a9e129b9ffe25668ee1602c4243f
Author: Andreas Schneider <asn at samba.org>
Date: Tue Feb 4 12:32:49 2014 +0100
cmake: Add --libs output for pkg-config.
commit 277d7194c1c7babc810bfa38e42b2ebd58d23372
Author: Andreas Schneider <asn at samba.org>
Date: Tue Feb 4 12:38:11 2014 +0100
cpack: Don't package the obj directory.
commit fe8d6b2895c24a195fc1b7d035cc661f85838bfb
Author: Andreas Schneider <asn at cryptomilk.org>
Date: Mon Feb 3 22:16:15 2014 +0100
tests: Use bool in the prototype too.
Reviewed-by: Stefan Metzmacher <metze at samba.org>
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 24 ++++++++++++++----------
CPackConfig.cmake | 2 +-
ChangeLog | 5 +++++
src/CMakeLists.txt | 4 ++++
tests/CMakeLists.txt | 4 ++--
tests/test_uwrap_enabled.c | 2 +-
uid_wrapper-config.cmake.in | 1 +
uid_wrapper.pc.cmake | 1 +
8 files changed, 29 insertions(+), 14 deletions(-)
create mode 100644 uid_wrapper-config.cmake.in
Changeset truncated at 500 lines:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b806e62..1513ed0 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}")
@@ -47,7 +47,18 @@ find_package(Threads)
include(ConfigureChecks.cmake)
configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+# check subdirectories
+add_subdirectory(src)
+
+if (UNIT_TESTING)
+ find_package(CMocka REQUIRED)
+ include(AddCMockaTest)
+ add_subdirectory(tests)
+endif (UNIT_TESTING)
+
# pkg-config file
+get_filename_component(UID_WRAPPER_LIB ${UID_WRAPPER_LOCATION} NAME)
+
configure_file(uid_wrapper.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/uid_wrapper.pc @ONLY)
install(
FILES
@@ -60,20 +71,13 @@ install(
# cmake config files
configure_file(uid_wrapper-config-version.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/uid_wrapper-config-version.cmake @ONLY)
+configure_file(uid_wrapper-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/uid_wrapper-config.cmake @ONLY)
install(
FILES
${CMAKE_CURRENT_BINARY_DIR}/uid_wrapper-config-version.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/uid_wrapper-config.cmake
DESTINATION
${CMAKE_INSTALL_DIR}
COMPONENT
devel
)
-
-# check subdirectories
-add_subdirectory(src)
-
-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..b15ee88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
ChangeLog
==========
+version 1.0.1 (released 2014-02-04)
+ * Added --libs to pkg-config.
+ * Added socket_wrapper-config.cmake
+ * Fixed a bug packaging the obj directory.
+
version 1.0.0 (released 2014-02-02)
* Initial release
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e1fb0b2..3476d5c 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(UWRAP_LOCATION uid_wrapper LOCATION)
+set(UID_WRAPPER_LOCATION ${UWRAP_LOCATION} PARENT_SCOPE)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3c6ab2b..9b1f4bb 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,9 +7,9 @@ include_directories(
)
if (OSX)
- set(TEST_ENVIRONMENT DYLD_FORCE_FLAT_NAMESPACE=1;DYLD_INSERT_LIBRARIES=${CMAKE_BINARY_DIR}/src/libuid_wrapper.dylib;UID_WRAPPER=1)
+ set(TEST_ENVIRONMENT DYLD_FORCE_FLAT_NAMESPACE=1;DYLD_INSERT_LIBRARIES=${UID_WRAPPER_LOCATION};UID_WRAPPER=1)
else ()
- set(TEST_ENVIRONMENT LD_PRELOAD=${CMAKE_BINARY_DIR}/src/libuid_wrapper.so;UID_WRAPPER=1)
+ set(TEST_ENVIRONMENT LD_PRELOAD=${UID_WRAPPER_LOCATION};UID_WRAPPER=1)
endif ()
add_cmocka_test(testsuite testsuite.c ${CMOCKA_LIBRARY})
diff --git a/tests/test_uwrap_enabled.c b/tests/test_uwrap_enabled.c
index b8aac44..b0be077 100644
--- a/tests/test_uwrap_enabled.c
+++ b/tests/test_uwrap_enabled.c
@@ -7,7 +7,7 @@
#include <stdbool.h>
-int uid_wrapper_enabled(void);
+bool uid_wrapper_enabled(void);
static void test_uid_wrapper_enabled(void **state)
{
diff --git a/uid_wrapper-config.cmake.in b/uid_wrapper-config.cmake.in
new file mode 100644
index 0000000..4649901
--- /dev/null
+++ b/uid_wrapper-config.cmake.in
@@ -0,0 +1 @@
+set(UID_WRAPPER_LIRBARY @LIB_INSTALL_DIR@/@UID_WRAPPER_LIB@)
diff --git a/uid_wrapper.pc.cmake b/uid_wrapper.pc.cmake
index 688e104..6377dfe 100644
--- a/uid_wrapper.pc.cmake
+++ b/uid_wrapper.pc.cmake
@@ -1,3 +1,4 @@
Name: @APPLICATION_NAME@
Description: The uid_wrapper library
Version: @APPLICATION_VERSION@
+Libs: @LIB_INSTALL_DIR@/@UID_WRAPPER_LIB@
--
UID Wrapper Repository
More information about the samba-cvs
mailing list