[Cmake-commits] [cmake-commits] hoffman committed FindJNI.cmake 1.44 1.45

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv25306

Modified Files:
	FindJNI.cmake 
Log Message:
Fix for bug#9686 convert java_home to a cmake path before using.


Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.44
retrieving revision 1.45
diff -C 2 -d -r1.44 -r1.45
*** FindJNI.cmake	30 Sep 2009 18:15:23 -0000	1.44
--- FindJNI.cmake	22 Oct 2009 10:57:00 -0000	1.45
***************
*** 68,76 ****
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
    )
  JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
!   $ENV{JAVA_HOME}/jre/lib/{libarch}
!   $ENV{JAVA_HOME}/jre/lib
!   $ENV{JAVA_HOME}/lib
!   $ENV{JAVA_HOME}
    /usr/lib
    /usr/local/lib
--- 68,79 ----
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
    )
+ 
+ FILE(TO_CMAKE_PATH "$ENV{JAVA_HOME}" _JAVA_HOME)
+ 
  JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
!   ${_JAVA_HOME}/jre/lib/{libarch}
!   ${_JAVA_HOME}/jre/lib
!   ${_JAVA_HOME}/lib
!   ${_JAVA_HOME}
    /usr/lib
    /usr/local/lib
***************
*** 107,111 ****
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
!   $ENV{JAVA_HOME}/include
    /usr/include 
    /usr/local/include
--- 110,114 ----
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
!   ${_JAVA_HOME}/include
    /usr/include 
    /usr/local/include