orion / rpms / cmake

Forked from rpms/cmake 3 years ago
Clone
94f7950
--- cmake-2.4.2/Modules/FindSWIG.cmake.fedora	2006-07-11 10:21:11.000000000 -0600
94f7950
+++ cmake-2.4.2/Modules/FindSWIG.cmake	2006-07-11 10:22:47.000000000 -0600
94f7950
@@ -7,13 +7,11 @@
94f7950
 SET(SWIG_FOUND FOOBAR)
94f7950
 FIND_PATH(SWIG_DIR
94f7950
   SWIGConfig.cmake
94f7950
-  /usr/share/swig1.3
94f7950
-  /usr/lib/swig1.3
94f7950
+  /usr/share/swig/*
94f7950
   /usr/local/share/swig1.3)
94f7950
 FIND_PATH(SWIG_DIR
94f7950
   swig.swg
94f7950
-  /usr/share/swig1.3
94f7950
-  /usr/lib/swig1.3
94f7950
+  /usr/share/swig/*
94f7950
   /usr/local/share/swig1.3)
94f7950
 IF(EXISTS ${SWIG_DIR})
94f7950
   IF("x${SWIG_DIR}x" STREQUAL "x${CMAKE_ROOT}/Modulesx")
8bcea31
--- cmake-2.4.3/Modules/FindJNI.cmake.orig	2006-10-31 16:07:57.000000000 -0700
8bcea31
+++ cmake-2.4.3/Modules/FindJNI.cmake	2006-10-31 16:09:36.000000000 -0700
8bcea31
@@ -14,6 +14,7 @@
8bcea31
   $ENV{JAVA_HOME}/jre/lib/i386
8bcea31
   $ENV{JAVA_HOME}/jre/lib/amd64
8bcea31
   /usr/lib
8bcea31
+  /usr/lib/jvm/java/lib
8bcea31
   /usr/local/lib
8bcea31
   /usr/lib/java/jre/lib/i386
8bcea31
   /usr/local/lib/java/jre/lib/i386
8bcea31
@@ -27,6 +28,7 @@
8bcea31
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
8bcea31
   $ENV{JAVA_HOME}/include
8bcea31
   /usr/include 
8bcea31
+  /usr/lib/jvm/java/include
8bcea31
   /usr/local/include
8bcea31
   /usr/lib/java/include
8bcea31
   /usr/local/lib/java/include