[SCM] Socket Wrapper Repository - branch master updated

Andreas Schneider asn at samba.org
Tue Oct 30 09:51:03 UTC 2018


The branch, master has been updated
       via  916ce9c cmake: Don't use string PREPEND
      from  32df6eb swrap: Fix coverity issues

https://git.samba.org/?p=socket_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 916ce9c66576f4de24dfe774fe9ab094187c1462
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Oct 24 08:44:19 2018 +0200

    cmake: Don't use string PREPEND
    
    This is only supported in cmake >= 3.10.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 tests/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3578f76..b43d03c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -83,8 +83,8 @@ function(ADD_CMOCKA_TEST_ENVIRONMENT _TEST_NAME)
     if (OSX)
         set(TORTURE_ENVIRONMENT "DYLD_FORCE_FLAT_NAMESPACE=1;DYLD_INSERT_LIBRARIES=${SOCKET_WRAPPER_LOCATION}")
     else ()
-        string(REPLACE ";" ":" TORTURE_ENVIRONMENT "${PRELOAD_LIBRARIES}")
-        string(PREPEND TORTURE_ENVIRONMENT "LD_PRELOAD=")
+        string(REPLACE ";" ":" _TMP_ENV "${PRELOAD_LIBRARIES}")
+        set(TORTURE_ENVIRONMENT "LD_PRELOAD=${_TMP_ENV}")
     endif()
 
     set_property(TEST


-- 
Socket Wrapper Repository



More information about the samba-cvs mailing list