[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1204-gd388158
Brad King
brad.king at kitware.com
Tue Dec 4 08:40:13 EST 2012
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 d3881588d5f6e6d35d92430c7e610a5e949ffd72 (commit)
via 2f49b71b65c7b595650ee61100430e37380bc948 (commit)
via 4a015f77e7be79bc02f6e3cb5b134cf29fbf4b49 (commit)
via 51c1119469ebf0e1c866711bd7acdf896fd74cf4 (commit)
via 6e7a3453b43897006cdd1b2587a3641fe3bd7731 (commit)
via 288f75edee99d6689f6651fe2ad00955d293d665 (commit)
from 49d59fdc2a95d6606bef7df9a06db8b397e23e0a (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=d3881588d5f6e6d35d92430c7e610a5e949ffd72
commit d3881588d5f6e6d35d92430c7e610a5e949ffd72
Merge: 49d59fd 2f49b71
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 4 08:40:10 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 4 08:40:10 2012 -0500
Merge topic 'OpenBSD-patches' into next
2f49b71 OpenBSD: Add path for Lua 5.1
4a015f7 OpenBSD: Add paths for Tcl/Tk 8.4/8.5
51c1119 OpenBSD: Add path for Freetype under X.org
6e7a345 OpenBSD: Add paths for Java 1.6.0/1.7.0 JRE/JDK
288f75e OpenBSD: Install shared libraries without executable permission
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f49b71b65c7b595650ee61100430e37380bc948
commit 2f49b71b65c7b595650ee61100430e37380bc948
Author: Amit Kulkarni <amitkulz at gmail.com>
AuthorDate: Mon Dec 3 17:42:10 2012 -0600
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 4 08:36:07 2012 -0500
OpenBSD: Add path for Lua 5.1
diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake
index eac25f5..2d7ed3d 100644
--- a/Modules/FindLua51.cmake
+++ b/Modules/FindLua51.cmake
@@ -28,7 +28,7 @@
find_path(LUA_INCLUDE_DIR lua.h
HINTS
ENV LUA_DIR
- PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
+ PATH_SUFFIXES include/lua51 include/lua5.1 include/lua-5.1 include/lua include
PATHS
~/Library/Frameworks
/Library/Frameworks
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a015f77e7be79bc02f6e3cb5b134cf29fbf4b49
commit 4a015f77e7be79bc02f6e3cb5b134cf29fbf4b49
Author: Amit Kulkarni <amitkulz at gmail.com>
AuthorDate: Mon Dec 3 17:38:49 2012 -0600
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 4 08:36:07 2012 -0500
OpenBSD: Add paths for Tcl/Tk 8.4/8.5
diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake
index 2f84ae0..f649ddc 100644
--- a/Modules/FindTCL.cmake
+++ b/Modules/FindTCL.cmake
@@ -82,6 +82,10 @@ set(TCLTK_POSSIBLE_LIB_PATHS
"${TK_LIBRARY_PATH}"
"${TCL_TCLSH_PATH_PARENT}/lib"
"${TK_WISH_PATH_PARENT}/lib"
+ /usr/local/lib/tcl/tcl8.5
+ /usr/local/lib/tcl/tk8.5
+ /usr/local/lib/tcl/tcl8.4
+ /usr/local/lib/tcl/tk8.4
)
if(WIN32)
@@ -168,6 +172,10 @@ set(TCLTK_POSSIBLE_INCLUDE_PATHS
/usr/include/tcl8.3
/usr/include/tcl8.2
/usr/include/tcl8.0
+ /usr/local/include/tcl8.5
+ /usr/local/include/tk8.5
+ /usr/local/include/tcl8.4
+ /usr/local/include/tk8.4
)
if(WIN32)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51c1119469ebf0e1c866711bd7acdf896fd74cf4
commit 51c1119469ebf0e1c866711bd7acdf896fd74cf4
Author: Amit Kulkarni <amitkulz at gmail.com>
AuthorDate: Mon Dec 3 17:29:55 2012 -0600
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 4 08:35:47 2012 -0500
OpenBSD: Add path for Freetype under X.org
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index cdb46be..1df2399 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -46,6 +46,7 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
HINTS
ENV FREETYPE_DIR
PATHS
+ /usr/X11R6
/usr/local/X11R6
/usr/local/X11
/usr/freeware
@@ -56,6 +57,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
HINTS
ENV FREETYPE_DIR
PATHS
+ /usr/X11R6
/usr/local/X11R6
/usr/local/X11
/usr/freeware
@@ -68,6 +70,7 @@ find_library(FREETYPE_LIBRARY
ENV FREETYPE_DIR
PATH_SUFFIXES lib
PATHS
+ /usr/X11R6
/usr/local/X11R6
/usr/local/X11
/usr/freeware
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e7a3453b43897006cdd1b2587a3641fe3bd7731
commit 6e7a3453b43897006cdd1b2587a3641fe3bd7731
Author: Amit Kulkarni <amitkulz at gmail.com>
AuthorDate: Mon Dec 3 17:23:10 2012 -0600
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 4 08:35:23 2012 -0500
OpenBSD: Add paths for Java 1.6.0/1.7.0 JRE/JDK
diff --git a/Modules/CMakeDetermineJavaCompiler.cmake b/Modules/CMakeDetermineJavaCompiler.cmake
index c4217f5..ae9f5fc 100644
--- a/Modules/CMakeDetermineJavaCompiler.cmake
+++ b/Modules/CMakeDetermineJavaCompiler.cmake
@@ -63,6 +63,8 @@ if(NOT CMAKE_Java_COMPILER)
/usr/java/j2sdk1.4.2_09/bin
/usr/lib/j2sdk1.5-sun/bin
/opt/sun-jdk-1.5.0.04/bin
+ /usr/local/jdk-1.7.0/bin
+ /usr/local/jdk-1.6.0/bin
)
# if no compiler has been specified yet, then look for one
if(CMAKE_Java_COMPILER_INIT)
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 0de3f79..9d708ca 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -120,6 +120,11 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
/usr/lib/jvm/default-java/jre/lib/{libarch}
/usr/lib/jvm/default-java/jre/lib
/usr/lib/jvm/default-java/lib
+ # OpenBSD specific paths for default JVM
+ /usr/local/jdk-1.7.0/jre/lib/{libarch}
+ /usr/local/jre-1.7.0/lib/{libarch}
+ /usr/local/jdk-1.6.0/jre/lib/{libarch}
+ /usr/local/jre-1.6.0/lib/{libarch}
)
set(JAVA_JVM_LIBRARY_DIRECTORIES)
@@ -153,6 +158,9 @@ set(JAVA_AWT_INCLUDE_DIRECTORIES
/opt/sun-jdk-1.5.0.04/include
# Debian specific path for default JVM
/usr/lib/jvm/default-java/include
+ # OpenBSD specific path for default JVM
+ /usr/local/jdk-1.7.0/include
+ /usr/local/jdk-1.6.0/include
)
foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
@@ -227,6 +235,7 @@ find_path(JAVA_INCLUDE_PATH2 jni_md.h
${JAVA_INCLUDE_PATH}/win32
${JAVA_INCLUDE_PATH}/linux
${JAVA_INCLUDE_PATH}/freebsd
+ ${JAVA_INCLUDE_PATH}/openbsd
${JAVA_INCLUDE_PATH}/solaris
${JAVA_INCLUDE_PATH}/hp-ux
${JAVA_INCLUDE_PATH}/alpha
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index 1b4593d..2f02b7a 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -80,6 +80,8 @@ set(_JAVA_PATHS
/usr/java/j2sdk1.4.2_09/bin
/usr/lib/j2sdk1.5-sun/bin
/opt/sun-jdk-1.5.0.04/bin
+ /usr/local/jdk-1.7.0/bin
+ /usr/local/jdk-1.6.0/bin
)
find_program(Java_JAVA_EXECUTABLE
NAMES java
@@ -107,6 +109,7 @@ if(Java_JAVA_EXECUTABLE)
# 2. OpenJDK 1.6
# 3. GCJ 1.5
# 4. Kaffe 1.4.2
+ # 5. OpenJDK 1.7.x on OpenBSD
if(var MATCHES "java version \"[0-9]+\\.[0-9]+\\.[0-9_.]+.*\".*")
# This is most likely Sun / OpenJDK, or maybe GCJ-java compat layer
string( REGEX REPLACE ".* version \"([0-9]+\\.[0-9]+\\.[0-9_.]+.*)\".*"
@@ -115,6 +118,10 @@ if(Java_JAVA_EXECUTABLE)
# Kaffe style
string( REGEX REPLACE "java full version \"kaffe-([0-9]+\\.[0-9]+\\.[0-9_]+).*"
"\\1" Java_VERSION_STRING "${var}" )
+ elseif(var MATCHES "openjdk version \"[0-9]+\\.[0-9]+\\.[0-9_]+\".*")
+ # OpenJDK ver 1.7.x on OpenBSD
+ string( REGEX REPLACE "openjdk version \"([0-9]+\\.[0-9]+\\.[0-9_]+).*"
+ "\\1" Java_VERSION_STRING "${var}" )
else()
if(NOT Java_FIND_QUIETLY)
message(WARNING "regex not supported: ${var}. Please report")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=288f75edee99d6689f6651fe2ad00955d293d665
commit 288f75edee99d6689f6651fe2ad00955d293d665
Author: Amit Kulkarni <amitkulz at gmail.com>
AuthorDate: Mon Dec 3 17:15:19 2012 -0600
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 4 08:25:33 2012 -0500
OpenBSD: Install shared libraries without executable permission
diff --git a/Modules/Platform/OpenBSD.cmake b/Modules/Platform/OpenBSD.cmake
index df240e0..53cabed 100644
--- a/Modules/Platform/OpenBSD.cmake
+++ b/Modules/Platform/OpenBSD.cmake
@@ -16,3 +16,7 @@ if(NOT CMAKE_PLATFORM_RUNTIME_PATH)
endif()
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)
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeDetermineJavaCompiler.cmake | 2 ++
Modules/FindFreetype.cmake | 3 +++
Modules/FindJNI.cmake | 9 +++++++++
Modules/FindJava.cmake | 7 +++++++
Modules/FindLua51.cmake | 2 +-
Modules/FindTCL.cmake | 8 ++++++++
Modules/Platform/OpenBSD.cmake | 4 ++++
7 files changed, 34 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list