cmake/cmake-2.4.2-fedora.patch

63 lines
1.7 KiB
Diff
Raw Normal View History

--- cmake-2.4.2/Modules/FindRuby.cmake.fedora 2006-07-11 10:20:14.000000000 -0600
+++ cmake-2.4.2/Modules/FindRuby.cmake 2006-07-11 10:20:38.000000000 -0600
@@ -9,6 +9,7 @@
SET(RUBY_POSSIBLE_INCLUDE_PATHS
- /usr/lib/ruby/1.8/i386-linux
+ /usr/lib/ruby/*/i386-linux
+ /usr/lib64/ruby/*/x86_64-linux
)
SET(RUBY_POSSIBLE_LIB_PATHS
@@ -19,12 +20,12 @@
${RUBY_POSSIBLE_INCLUDE_PATHS})
FIND_LIBRARY(RUBY_LIBRARY
- NAMES ruby1.8
+ NAMES ruby
PATHS ${RUBY_POSSIBLE_LIB_PATHS}
)
FIND_PROGRAM(RUBY_EXECUTABLE
- NAMES ruby1.8
+ NAMES ruby
PATHS
/usr/bin
/usr/local/bin
--- cmake-2.4.2/Modules/FindSWIG.cmake.fedora 2006-07-11 10:21:11.000000000 -0600
+++ cmake-2.4.2/Modules/FindSWIG.cmake 2006-07-11 10:22:47.000000000 -0600
@@ -7,13 +7,11 @@
SET(SWIG_FOUND FOOBAR)
FIND_PATH(SWIG_DIR
SWIGConfig.cmake
- /usr/share/swig1.3
- /usr/lib/swig1.3
+ /usr/share/swig/*
/usr/local/share/swig1.3)
FIND_PATH(SWIG_DIR
swig.swg
- /usr/share/swig1.3
- /usr/lib/swig1.3
+ /usr/share/swig/*
/usr/local/share/swig1.3)
IF(EXISTS ${SWIG_DIR})
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