diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-10-22 10:57:00 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-10-22 10:57:00 (GMT) |
| commit | e1c1ab7197785b54de9b36f6b335419f333d9f12 (patch) | |
| tree | 8a27e16232a2340c594295d1857ac58c38744171 /Modules/FindJNI.cmake | |
| parent | 7b5ae0d2822107aabce3ea4f344a12a095748d26 (diff) | |
| download | CMake-e1c1ab7197785b54de9b36f6b335419f333d9f12.zip CMake-e1c1ab7197785b54de9b36f6b335419f333d9f12.tar.gz CMake-e1c1ab7197785b54de9b36f6b335419f333d9f12.tar.bz2 | |
Fix for bug#9686 convert java_home to a cmake path before using.
Diffstat (limited to 'Modules/FindJNI.cmake')
| -rw-r--r-- | Modules/FindJNI.cmake | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index 8c9523a..707d1fa 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -67,11 +67,14 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib" "[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 - $ENV{JAVA_HOME}/jre/lib/{libarch} - $ENV{JAVA_HOME}/jre/lib - $ENV{JAVA_HOME}/lib - $ENV{JAVA_HOME} + ${_JAVA_HOME}/jre/lib/{libarch} + ${_JAVA_HOME}/jre/lib + ${_JAVA_HOME}/lib + ${_JAVA_HOME} /usr/lib /usr/local/lib /usr/lib/jvm/java/lib @@ -106,7 +109,7 @@ SET(JAVA_AWT_INCLUDE_DIRECTORIES "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include" "[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 + ${_JAVA_HOME}/include /usr/include /usr/local/include /usr/lib/java/include |