[SCM] UID Wrapper Repository - branch master updated

Andreas Schneider asn at samba.org
Fri Apr 25 06:00:49 MDT 2014


The branch, master has been updated
       via  15d3bb8 cmake: Fix policy check.
       via  8d2d0dd cmake: Install cmake config into the correct directory.
      from  30abe3c cmake: Use 2.8.13 as version to check.

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


- Log -----------------------------------------------------------------
commit 15d3bb846ee2efb527c5ab48e652f83fbdd4cec3
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Apr 25 14:00:39 2014 +0200

    cmake: Fix policy check.

commit 8d2d0ddae725c5cf475c9b2a7e20eb0cfe65689d
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Apr 16 15:47:34 2014 +0200

    cmake: Install cmake config into the correct directory.

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

Summary of changes:
 CMakeLists.txt     |    2 +-
 src/CMakeLists.txt |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1513ed0..80fcaf1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,7 +77,7 @@ install(
         ${CMAKE_CURRENT_BINARY_DIR}/uid_wrapper-config-version.cmake
         ${CMAKE_CURRENT_BINARY_DIR}/uid_wrapper-config.cmake
     DESTINATION
-        ${CMAKE_INSTALL_DIR}
+        ${CMAKE_INSTALL_DIR}/uid_wrapper
     COMPONENT
         devel
 )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 88b65f5..9dbfb75 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,7 +22,7 @@ install(
 )
 
 # This needs to be at the end
-if (CMAKE_VERSION VERSION_GREATER 2.8.13)
+if (POLICY CMP0026)
     cmake_policy(SET CMP0026 OLD)
 endif()
 get_target_property(UWRAP_LOCATION uid_wrapper LOCATION)


-- 
UID Wrapper Repository


More information about the samba-cvs mailing list