[SCM] NSS Wrapper Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  a5b392d cmake: Fix policy check.
       via  3f29031 cmake: Install cmake config into the correct directory.
       via  5b96753 cmake: Set version to 2.8.13.
      from  db4ac82 Update to version 1.0.2.

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


- Log -----------------------------------------------------------------
commit a5b392db3bff57d2f6e446266e924f37112a20ba
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Apr 25 13:59:00 2014 +0200

    cmake: Fix policy check.

commit 3f29031f6a0825177c333129360dde862d696a4c
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Apr 16 15:46:55 2014 +0200

    cmake: Install cmake config into the correct directory.

commit 5b96753d877a77b91d0dcc3a886cd10a926d92d6
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Apr 9 11:56:44 2014 +0200

    cmake: Set version to 2.8.13.

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

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 fd621e9..40d6595 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,7 +83,7 @@ install(
         ${CMAKE_CURRENT_BINARY_DIR}/nss_wrapper-config-version.cmake
         ${CMAKE_CURRENT_BINARY_DIR}/nss_wrapper-config.cmake
     DESTINATION
-        ${CMAKE_INSTALL_DIR}
+        ${CMAKE_INSTALL_DIR}/nss_wrapper
     COMPONENT
         devel
 )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e5dccc5..36b05a8 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.12)
+if (POLICY CMP0026)
     cmake_policy(SET CMP0026 OLD)
 endif()
 get_target_property(NWRAP_LOCATION nss_wrapper LOCATION)


-- 
NSS Wrapper Repository