/[gentoo-x86]/dev-util/cmake/files/cmake-FindJNI.patch
Gentoo

Contents of /dev-util/cmake/files/cmake-FindJNI.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Sun May 8 11:33:39 2011 UTC (3 years, 2 months ago) by scarabeus
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Drop older stuff. Keep just latest stable.

(Portage version: 2.2.0_alpha31/cvs/Linux x86_64)

1 diff -ru ./Modules/FindJNI.cmake ../a/Modules/FindJNI.cmake
2 --- ./Modules/FindJNI.cmake 2009-02-21 21:36:50.000000000 +0100
3 +++ ../a/Modules/FindJNI.cmake 2008-11-24 04:44:06.000000000 +0100
4 @@ -2,7 +2,7 @@
5 # This module finds if Java is installed and determines where the
6 # include files and libraries are. It also determines what the name of
7 # the library is. This code sets the following variables:
8 -#
9 +#
10 # JNI_INCLUDE_DIRS = the include dirs to use
11 # JNI_LIBRARIES = the libraries to use
12 # JAVA_AWT_LIBRARY = the path to the jawt library
13 @@ -51,6 +51,8 @@
14 "${dir}"
15 "${dir}/client"
16 "${dir}/server"
17 + "${dir}/j9vm"
18 + "${dir}/classic"
19 )
20 ENDFOREACH(dir)
21
22 @@ -60,7 +62,7 @@
23 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
24 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
25 $ENV{JAVA_HOME}/include
26 - /usr/include
27 + /usr/include
28 /usr/local/include
29 /usr/lib/java/include
30 /usr/local/lib/java/include
31 @@ -126,7 +128,7 @@
32 )
33 ENDIF(JAVA_HAVE_FRAMEWORK)
34 ELSE(APPLE)
35 - FIND_LIBRARY(JAVA_AWT_LIBRARY jawt
36 + FIND_LIBRARY(JAVA_AWT_LIBRARY jawt
37 PATHS ${JAVA_AWT_LIBRARY_DIRECTORIES}
38 )
39 FIND_LIBRARY(JAVA_JVM_LIBRARY NAMES jvm JavaVM
40 @@ -134,18 +136,23 @@
41 )
42 ENDIF(APPLE)
43
44 -# add in the include path
45 -FIND_PATH(JAVA_INCLUDE_PATH jni.h
46 +# add in the include path
47 +FIND_PATH(JAVA_INCLUDE_PATH jni.h
48 ${JAVA_AWT_INCLUDE_DIRECTORIES}
49 )
50
51 -FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h
52 +FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h
53 ${JAVA_AWT_INCLUDE_DIRECTORIES}
54 ${JAVA_INCLUDE_PATH}/win32
55 ${JAVA_INCLUDE_PATH}/linux
56 ${JAVA_INCLUDE_PATH}/freebsd
57 )
58
59 +FIND_PATH(JAVA_INCLUDE_PATH2 jniport.h
60 + ${JAVA_AWT_INCLUDE_DIRECTORIES}
61 + ${JAVA_INCLUDE_PATH}
62 +)
63 +
64 FIND_PATH(JAVA_AWT_INCLUDE_PATH jawt.h
65 ${JAVA_AWT_INCLUDE_DIRECTORIES}
66 ${JAVA_INCLUDE_PATH}
67 @@ -169,4 +176,3 @@
68 ${JAVA_INCLUDE_PATH2}
69 ${JAVA_AWT_INCLUDE_PATH}
70 )
71 -

  ViewVC Help
Powered by ViewVC 1.1.20