The branch, master has been updated via 3a6f853 Bump version to 1.0.1. via 7d020b0 cmake: Add socket_wrapper-config.cmake. via c792dd7 cmake: Use SOCKET_WRAPPER_LOCATION. via 77944cd cmake: Add --libs output for pkg-config. via 23631b4 cpack: Don't package the obj directory. from b136de0 src: Add a public socket_wrapper_enabled() function.
http://gitweb.samba.org/?p=socket_wrapper.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 3a6f8539bb6f31878bf7547bf71df63338771adb Author: Andreas Schneider <a...@samba.org> Date: Tue Feb 4 12:01:39 2014 +0100 Bump version to 1.0.1. commit 7d020b04d3f664b746a7aa4ef6add5b56ef94552 Author: Andreas Schneider <a...@samba.org> Date: Tue Feb 4 12:01:25 2014 +0100 cmake: Add socket_wrapper-config.cmake. commit c792dd72777453d29da33a7474a6c893216cfd0c Author: Andreas Schneider <a...@samba.org> Date: Tue Feb 4 12:43:12 2014 +0100 cmake: Use SOCKET_WRAPPER_LOCATION. commit 77944cd180a758655e0c7863e19449adeecbf7dc Author: Andreas Schneider <a...@samba.org> Date: Tue Feb 4 11:56:33 2014 +0100 cmake: Add --libs output for pkg-config. commit 23631b4c920bdcf14d6151a1f4f89d49b78c2feb Author: Andreas Schneider <a...@samba.org> Date: Tue Feb 4 12:03:53 2014 +0100 cpack: Don't package the obj directory. ----------------------------------------------------------------------- Summary of changes: CMakeLists.txt | 23 ++++++++++++++--------- CPackConfig.cmake | 2 +- ChangeLog | 5 +++++ socket_wrapper-config.cmake.in | 1 + socket_wrapper.pc.cmake | 1 + src/CMakeLists.txt | 4 ++++ tests/CMakeLists.txt | 4 ++-- 7 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 socket_wrapper-config.cmake.in Changeset truncated at 500 lines: diff --git a/CMakeLists.txt b/CMakeLists.txt index 134960a..9696f4d 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(SOCKET_WRAPPER_LIB ${SOCKET_WRAPPER_LOCATION} NAME) + configure_file(socket_wrapper.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/socket_wrapper.pc @ONLY) install( FILES @@ -60,20 +71,14 @@ install( # cmake config files configure_file(socket_wrapper-config-version.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/socket_wrapper-config-version.cmake @ONLY) +configure_file(socket_wrapper-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/socket_wrapper-config.cmake @ONLY) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/socket_wrapper-config-version.cmake + ${CMAKE_CURRENT_BINARY_DIR}/socket_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/socket_wrapper-config.cmake.in b/socket_wrapper-config.cmake.in new file mode 100644 index 0000000..732d784 --- /dev/null +++ b/socket_wrapper-config.cmake.in @@ -0,0 +1 @@ +set(SOCKET_WRAPPER_LIRBARY @LIB_INSTALL_DIR@/@SOCKET_WRAPPER_LIB@) diff --git a/socket_wrapper.pc.cmake b/socket_wrapper.pc.cmake index e465733..6dc71f7 100644 --- a/socket_wrapper.pc.cmake +++ b/socket_wrapper.pc.cmake @@ -1,3 +1,4 @@ Name: @APPLICATION_NAME@ Description: The socket_wrapper library Version: @APPLICATION_VERSION@ +Libs: @LIB_INSTALL_DIR@/@SOCKET_WRAPPER_LIB@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bdbe890..cf70501 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,3 +21,7 @@ set_target_properties( SOVERSION ${LIBRARY_SOVERSION} ) + +# This needs to be at the end +get_target_property(SWRAP_LOCATION socket_wrapper LOCATION) +set(SOCKET_WRAPPER_LOCATION ${SWRAP_LOCATION} PARENT_SCOPE) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 53d458c..988e60f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -39,12 +39,12 @@ foreach(_SWRAP_TEST ${SWRAP_TESTS}) TEST ${_SWRAP_TEST} PROPERTY - ENVIRONMENT DYLD_FORCE_FLAT_NAMESPACE=1;DYLD_INSERT_LIBRARIES=${CMAKE_BINARY_DIR}/src/libsocket_wrapper.dylib) + ENVIRONMENT DYLD_FORCE_FLAT_NAMESPACE=1;DYLD_INSERT_LIBRARIES=${SOCKET_WRAPPER_LOCATION}) else () set_property( TEST ${_SWRAP_TEST} PROPERTY - ENVIRONMENT LD_PRELOAD=${CMAKE_BINARY_DIR}/src/libsocket_wrapper.so) + ENVIRONMENT LD_PRELOAD=${SOCKET_WRAPPER_LOCATION}) endif() endforeach() -- Socket Wrapper Repository