[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3244-gf83aa55

[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  f83aa55ad7666581ea5ff65ba40ab95ba47d6b3f (commit)
       via  7ed1e7c5f91494adf0ccdcf39909e6f20641bfeb (commit)
      from  5c7802af9934ce270a4ddc016c193504983976ac (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=f83aa55ad7666581ea5ff65ba40ab95ba47d6b3f
commit f83aa55ad7666581ea5ff65ba40ab95ba47d6b3f
Merge: 5c7802a 7ed1e7c
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue May 20 11:43:44 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 20 11:43:44 2014 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ed1e7c5f91494adf0ccdcf39909e6f20641bfeb
commit 7ed1e7c5f91494adf0ccdcf39909e6f20641bfeb
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: Tue May 20 17:43:29 2014 +0200

    OpenBSD: honor the LOCALBASE and X11BASE environment variables

diff --git a/Modules/Platform/OpenBSD.cmake b/Modules/Platform/OpenBSD.cmake
index a4f6114..57bef4f 100644
--- a/Modules/Platform/OpenBSD.cmake
+++ b/Modules/Platform/OpenBSD.cmake
@@ -20,3 +20,22 @@ set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_OPENBSD_VERSIONING 1)
 # 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_INCLUDE_PATH
+  ${OPENBSD_LOCALBASE}/include)
+list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+  ${OPENBSD_LOCALBASE}/lib)
+list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
+  ${OPENBSD_LOCALBASE}/bin
+  ${OPENBSD_LOCALBASE}/sbin)

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

Summary of changes:
 Modules/Platform/OpenBSD.cmake |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)


hooks/post-receive
-- 
CMake