rpms/cmake
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add /usr/lib/jvm/java to FindJNI search paths

Browse Source
This commit is contained in:
Orion Poplawski 2006-10-31 23:11:16 +00:00
parent e493a8080c
commit 8bcea31ac4
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmake-2.4.2-fedora.patch
View File

@ -42,3 +42,21 @@
/usr/local/share/swig1.3) /usr/local/share/swig1.3)
IF(EXISTS ${SWIG_DIR}) IF(EXISTS ${SWIG_DIR})
IF("x${SWIG_DIR}x" STREQUAL "x${CMAKE_ROOT}/Modulesx") IF("x${SWIG_DIR}x" STREQUAL "x${CMAKE_ROOT}/Modulesx")
--- cmake-2.4.3/Modules/FindJNI.cmake.orig 2006-10-31 16:07:57.000000000 -0700
+++ cmake-2.4.3/Modules/FindJNI.cmake 2006-10-31 16:09:36.000000000 -0700
@@ -14,6 +14,7 @@
$ENV{JAVA_HOME}/jre/lib/i386
$ENV{JAVA_HOME}/jre/lib/amd64
/usr/lib
+ /usr/lib/jvm/java/lib
/usr/local/lib
/usr/lib/java/jre/lib/i386
/usr/local/lib/java/jre/lib/i386
@@ -27,6 +28,7 @@
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
$ENV{JAVA_HOME}/include
/usr/include
+ /usr/lib/jvm/java/include
/usr/local/include
/usr/lib/java/include
/usr/local/lib/java/include

5
cmake.spec
View File

@ -1,6 +1,6 @@
Name: cmake Name: cmake
Version: 2.4.3 Version: 2.4.3
Release: 3%{?dist} Release: 4%{?dist}
Summary: Cross-platform make system Summary: Cross-platform make system
Group: Development/Tools Group: Development/Tools
@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Oct 31 2006 Orion Poplawski <orion@cora.nwra.com> - 2.4.3-4
- Add /usr/lib/jvm/java to FindJNI search paths
* Tue Aug 29 2006 Orion Poplawski <orion@cora.nwra.com> - 2.4.3-3 * Tue Aug 29 2006 Orion Poplawski <orion@cora.nwra.com> - 2.4.3-3
- Rebuild for FC6 - Rebuild for FC6