[SCM] UID Wrapper Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  ea30cd9 cmake: Remove unsed dir definitions
       via  f140709 cmake: Fix BINARYDIR and SOURCEDIR
       via  c4eef87 cmake: Remove unused variable
       via  63685a6 cmake: Add missing PICKY_DEVELOPER option
      from  d966dd2 Bump version to 1.2.7

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


- Log -----------------------------------------------------------------
commit ea30cd99d4d45fc58e7e10555a71716e9aa68380
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Oct 17 17:36:36 2019 +0200

    cmake: Remove unsed dir definitions
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit f140709f325ddb43431b11f655ef94d42a95e172
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Oct 17 17:36:05 2019 +0200

    cmake: Fix BINARYDIR and SOURCEDIR
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit c4eef87e811e1726f13db7c05850f4ce65bf991d
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Oct 17 15:41:06 2019 +0200

    cmake: Remove unused variable
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit 63685a67ef9a606b77f11f348f7224e71985c28e
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Oct 17 15:33:46 2019 +0200

    cmake: Add missing PICKY_DEVELOPER option
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

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

Summary of changes:
 ConfigureChecks.cmake | 8 ++------
 DefineOptions.cmake   | 1 +
 config.h.cmake        | 5 -----
 tests/CMakeLists.txt  | 2 --
 4 files changed, 3 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index affe7c6..0e2d84f 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -9,13 +9,9 @@ include(TestBigEndian)
 
 set(PACKAGE ${PROJECT_NAME})
 set(VERSION ${PROJECT_VERSION})
-set(DATADIR ${DATA_INSTALL_DIR})
-set(LIBDIR ${LIB_INSTALL_DIR})
-set(PLUGINDIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}")
-set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
 
-set(BINARYDIR ${CMAKE_BINARY_DIR})
-set(SOURCEDIR ${CMAKE_SOURCE_DIR})
+set(BINARYDIR ${uid_wrapper_BINARY_DIR})
+set(SOURCEDIR ${uid_wrapper_SOURCE_DIR})
 
 function(COMPILER_DUMPVERSION _OUTPUT_VERSION)
     # Remove whitespaces from the argument.
diff --git a/DefineOptions.cmake b/DefineOptions.cmake
index 6030e79..8fc654d 100644
--- a/DefineOptions.cmake
+++ b/DefineOptions.cmake
@@ -1 +1,2 @@
 option(UNIT_TESTING "Build with unit tests" OFF)
+option(PICKY_DEVELOPER "Build with picky developer flags" OFF)
diff --git a/config.h.cmake b/config.h.cmake
index 630a17d..a3f3815 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -4,11 +4,6 @@
 /* Version number of package */
 #cmakedefine VERSION "${PROJECT_VERSION}"
 
-#cmakedefine LOCALEDIR "${LOCALE_INSTALL_DIR}"
-#cmakedefine DATADIR "${DATADIR}"
-#cmakedefine LIBDIR "${LIBDIR}"
-#cmakedefine PLUGINDIR "${PLUGINDIR}"
-#cmakedefine SYSCONFDIR "${SYSCONFDIR}"
 #cmakedefine BINARYDIR "${BINARYDIR}"
 #cmakedefine SOURCEDIR "${SOURCEDIR}"
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6056937..1ae3d86 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,7 +1,5 @@
 project(tests C)
 
-set(PRELOAD_LIBS ${UID_WRAPPER_LOCATION})
-
 function(ADD_CMOCKA_TEST_ENVIRONMENT _TEST_NAME)
     if (CMAKE_BUILD_TYPE)
         string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)


-- 
UID Wrapper Repository