[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3297-g3d779aa

[Rolf Eike Beer]

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  3d779aa2dd9ebf297a5785c8f6c105415dca148f (commit)
       via  bd32b682f21738532cbfbe7cf5b0acd9e86f77cc (commit)
      from  156dfffcc046866e84e1413ec3465cae52701b0e (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=3d779aa2dd9ebf297a5785c8f6c105415dca148f
commit 3d779aa2dd9ebf297a5785c8f6c105415dca148f
Merge: 156dfff bd32b68
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed May 21 14:39:09 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 21 14:39:09 2014 -0400

    Merge topic 'OpenBSD-paths' into next
    
    bd32b682 OpenBSD: honor the LOCALBASE and X11BASE environment variables


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd32b682f21738532cbfbe7cf5b0acd9e86f77cc
commit bd32b682f21738532cbfbe7cf5b0acd9e86f77cc
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue May 20 17:43:29 2014 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed May 21 20:38:55 2014 +0200

    OpenBSD: honor the LOCALBASE and X11BASE environment variables

diff --git a/Modules/Platform/OpenBSD.cmake b/Modules/Platform/OpenBSD.cmake
index 023f055..7ac6c7e 100644
--- a/Modules/Platform/OpenBSD.cmake
+++ b/Modules/Platform/OpenBSD.cmake
@@ -23,3 +23,16 @@ set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
 # OpenBSD policy requires that shared libraries be installed without
 # executable permission.
 set(CMAKE_INSTALL_SO_NO_EXE 1)
+
+if($ENV{LOCALBASE})
+  set(OPENBSD_LOCALBASE $ENV{LOCALBASE})
+else()
+  set(OPENBSD_LOCALBASE /usr/local)
+endif()
+if($ENV{X11BASE})
+  set(OPENBSD_X11BASE $ENV{X11BASE})
+else()
+  set(OPENBSD_X11BASE /usr/X11R6)
+endif()
+
+list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${OPENBSD_LOCALBASE})

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

Summary of changes:


hooks/post-receive
-- 
CMake