The branch, master has been updated via 12c6934 Bump version to 1.3.3 via 2a1fa0f cmake: Define a library version for the noop lib via bb5dcee cmake: Export cmake config for socket_wrapper_noop via 12d4d02 cmake: Set public include dir for socket_wrapper_noop target via 176dff0 cmake: Set PRIVATE for linking libraries from 181a3fa swrap: wrap __close_nocancel() if available
https://git.samba.org/?p=socket_wrapper.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 12c6934ee23b387f9f8cfbb89d44a100d4d61b4f Author: Andreas Schneider <a...@samba.org> Date: Mon Mar 15 08:24:57 2021 +0100 Bump version to 1.3.3 Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 2a1fa0f36e4cc2bc9df07852967f8057cfec315a Author: Andreas Schneider <a...@samba.org> Date: Mon Mar 15 08:22:33 2021 +0100 cmake: Define a library version for the noop lib Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit bb5dcee4c28b0c64cfe19ed7f218b9970693dc2d Author: Andreas Schneider <a...@samba.org> Date: Mon Mar 15 08:18:15 2021 +0100 cmake: Export cmake config for socket_wrapper_noop Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 12d4d02399cce64eb0d7895b97b3faa169f04ed7 Author: Andreas Schneider <a...@samba.org> Date: Mon Mar 15 08:17:34 2021 +0100 cmake: Set public include dir for socket_wrapper_noop target Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 176dff0bd8c8e9fb3a409a4af634ec7d039955de Author: Andreas Schneider <a...@samba.org> Date: Mon Mar 15 08:09:29 2021 +0100 cmake: Set PRIVATE for linking libraries Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> ----------------------------------------------------------------------- Summary of changes: CHANGELOG | 6 ++++++ CMakeLists.txt | 12 +++++++++--- src/CMakeLists.txt | 19 ++++++++++++++----- 3 files changed, 29 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/CHANGELOG b/CHANGELOG index c2cbb23..ed579e2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,12 @@ ChangeLog ========== +version 1.3.3 (released 2021-03-17) + * Added public libsocket_wrapper_noop library + * Added wrapper for wrap __close_nocancel() + * Fixed possible deadlock in swrap_pcap_dump_packet() + * Fixed issue when writing pcap files + version 1.3.2 (released 2021-02-10) * Fixed possible memory leak between swrap_recvmsg_{before,after}_unix() diff --git a/CMakeLists.txt b/CMakeLists.txt index 8927ebb..bc6a786 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(socket_wrapper VERSION 1.3.2 LANGUAGES C) +project(socket_wrapper VERSION 1.3.3 LANGUAGES C) # global needed variables set(APPLICATION_NAME ${PROJECT_NAME}) @@ -24,11 +24,17 @@ set(APPLICATION_NAME ${PROJECT_NAME}) # If the source code was changed, but there were no interface changes: # Increment PATCH. set(LIBRARY_VERSION_MAJOR 0) -set(LIBRARY_VERSION_MINOR 2) -set(LIBRARY_VERSION_PATCH 2) +set(LIBRARY_VERSION_MINOR 3) +set(LIBRARY_VERSION_PATCH 0) set(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}") set(LIBRARY_SOVERSION ${LIBRARY_VERSION_MAJOR}) +set(NOOP_LIBRARY_VERSION_MAJOR 0) +set(NOOP_LIBRARY_VERSION_MINOR 0) +set(NOOP_LIBRARY_VERSION_PATCH 1) +set(NOOP_LIBRARY_VERSION "${NOOP_LIBRARY_VERSION_MAJOR}.${NOOP_LIBRARY_VERSION_MINOR}.${NOOP_LIBRARY_VERSION_PATCH}") +set(NOOP_LIBRARY_SOVERSION ${NOOP_LIBRARY_VERSION_MAJOR}) + # add definitions include(DefinePlatformDefaults) include(DefineOptions.cmake) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ac56c86..a1dbfaf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,7 +8,8 @@ target_compile_options(socket_wrapper PRIVATE ${DEFAULT_C_COMPILE_FLAGS} -D_GNU_SOURCE) -target_link_libraries(socket_wrapper ${SWRAP_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(socket_wrapper + PRIVATE ${SWRAP_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) set_target_properties(socket_wrapper PROPERTIES @@ -31,16 +32,20 @@ set(SOCKET_WRAPPER_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_ add_library(socket_wrapper_noop SHARED socket_wrapper_noop.c) target_include_directories(socket_wrapper_noop PRIVATE - ${CMAKE_BINARY_DIR}) + ${socket_wrapper_BINARY_DIR} + PUBLIC + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> + $<INSTALL_INTERFACE:include>) target_compile_options(socket_wrapper_noop PRIVATE ${DEFAULT_C_COMPILE_FLAGS} -D_GNU_SOURCE) -target_link_libraries(socket_wrapper_noop ${SWRAP_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(socket_wrapper_noop + PRIVATE ${SWRAP_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) set_target_properties(socket_wrapper_noop PROPERTIES - VERSION ${LIBRARY_VERSION} - SOVERSION ${LIBRARY_SOVERSION}) + VERSION ${NOOP_LIBRARY_VERSION} + SOVERSION ${NOOP_LIBRARY_SOVERSION}) if (DEFINED DEFAULT_LINK_FLAGS) set_target_properties(socket_wrapper_noop PROPERTIES @@ -48,11 +53,15 @@ if (DEFINED DEFAULT_LINK_FLAGS) endif() install(TARGETS socket_wrapper_noop + EXPORT socket_wrapper_noop-config RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) +install(EXPORT socket_wrapper_noop-config + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/socket_wrapper) + install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/socket_wrapper.h -- Socket Wrapper Repository