[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-497-g4f7a93d

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4f7a93d21a9f9be423a9977aae575b0356246506 (commit)
       via  763a73ba7bf964ee67a3f89241426ff194bb3cd1 (commit)
      from  8a99f6d24c67cdc2ab68c18cbe4da7174f9a8b62 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f7a93d21a9f9be423a9977aae575b0356246506
commit 4f7a93d21a9f9be423a9977aae575b0356246506
Merge: 8a99f6d 763a73b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 18 09:00:26 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 18 09:00:26 2015 -0400

    Merge topic 'GNUInstallDirs-special-prefixes' into next
    
    763a73ba fixup! GNUInstallDirs: Add test cases


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=763a73ba7bf964ee67a3f89241426ff194bb3cd1
commit 763a73ba7bf964ee67a3f89241426ff194bb3cd1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 18 08:58:50 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 18 08:58:50 2015 -0400

    fixup! GNUInstallDirs: Add test cases

diff --git a/Tests/RunCMake/GNUInstallDirs/Common.cmake b/Tests/RunCMake/GNUInstallDirs/Common.cmake
index 812fadf..eff2d54 100644
--- a/Tests/RunCMake/GNUInstallDirs/Common.cmake
+++ b/Tests/RunCMake/GNUInstallDirs/Common.cmake
@@ -1,3 +1,9 @@
+set(CMAKE_SIZEOF_VOID_P 8)
+set(CMAKE_LIBRARY_ARCHITECTURE "arch")
+if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+  set(CMAKE_SYSTEM_NAME "OpenBSD-Fake")
+endif()
+include(GNUInstallDirs)
 set(dirs
   BINDIR
   DATADIR
diff --git a/Tests/RunCMake/GNUInstallDirs/Opt.cmake b/Tests/RunCMake/GNUInstallDirs/Opt.cmake
index a475d98..49eab0e 100644
--- a/Tests/RunCMake/GNUInstallDirs/Opt.cmake
+++ b/Tests/RunCMake/GNUInstallDirs/Opt.cmake
@@ -1,5 +1,2 @@
 set(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
-set(CMAKE_SIZEOF_VOID_P 8)
-set(CMAKE_LIBRARY_ARCHITECTURE "arch")
-include(GNUInstallDirs)
 include(Common.cmake)
diff --git a/Tests/RunCMake/GNUInstallDirs/Root.cmake b/Tests/RunCMake/GNUInstallDirs/Root.cmake
index 69e2f38..f8cc641 100644
--- a/Tests/RunCMake/GNUInstallDirs/Root.cmake
+++ b/Tests/RunCMake/GNUInstallDirs/Root.cmake
@@ -1,5 +1,2 @@
 set(CMAKE_INSTALL_PREFIX "/")
-set(CMAKE_SIZEOF_VOID_P 8)
-set(CMAKE_LIBRARY_ARCHITECTURE "arch")
-include(GNUInstallDirs)
 include(Common.cmake)
diff --git a/Tests/RunCMake/GNUInstallDirs/Usr.cmake b/Tests/RunCMake/GNUInstallDirs/Usr.cmake
index 1c2e439..62b7288 100644
--- a/Tests/RunCMake/GNUInstallDirs/Usr.cmake
+++ b/Tests/RunCMake/GNUInstallDirs/Usr.cmake
@@ -1,5 +1,2 @@
 set(CMAKE_INSTALL_PREFIX "/usr")
-set(CMAKE_SIZEOF_VOID_P 8)
-set(CMAKE_LIBRARY_ARCHITECTURE "arch")
-include(GNUInstallDirs)
 include(Common.cmake)
diff --git a/Tests/RunCMake/GNUInstallDirs/UsrLocal.cmake b/Tests/RunCMake/GNUInstallDirs/UsrLocal.cmake
index d3be2c8..59d9331 100644
--- a/Tests/RunCMake/GNUInstallDirs/UsrLocal.cmake
+++ b/Tests/RunCMake/GNUInstallDirs/UsrLocal.cmake
@@ -1,5 +1,2 @@
 set(CMAKE_INSTALL_PREFIX "/usr/local")
-set(CMAKE_SIZEOF_VOID_P 8)
-set(CMAKE_LIBRARY_ARCHITECTURE "arch")
-include(GNUInstallDirs)
 include(Common.cmake)

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

Summary of changes:
 Tests/RunCMake/GNUInstallDirs/Common.cmake   |    6 ++++++
 Tests/RunCMake/GNUInstallDirs/Opt.cmake      |    3 ---
 Tests/RunCMake/GNUInstallDirs/Root.cmake     |    3 ---
 Tests/RunCMake/GNUInstallDirs/Usr.cmake      |    3 ---
 Tests/RunCMake/GNUInstallDirs/UsrLocal.cmake |    3 ---
 5 files changed, 6 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake