diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-11 20:56:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-01-11 20:56:59 (GMT) |
| commit | 784d5ce0f8bf630901dece526df7ce663da17e6a (patch) | |
| tree | 0b4647ace5986304b15b3f900fee969e278f33db /Modules/FindJNI.cmake | |
| parent | 2d3594b1bbd48d0dc7a071a6806c75c89341e1c5 (diff) | |
| parent | ce28737c933a749cbc84c601f3ac9f56e4c832aa (diff) | |
| download | CMake-784d5ce0f8bf630901dece526df7ce663da17e6a.zip CMake-784d5ce0f8bf630901dece526df7ce663da17e6a.tar.gz CMake-784d5ce0f8bf630901dece526df7ce663da17e6a.tar.bz2 | |
Merge branch 'policy-CMP0017' into resolve/python-versions/policy-CMP0017
Conflicts:
Modules/FindPythonInterp.cmake
Diffstat (limited to 'Modules/FindJNI.cmake')
| -rw-r--r-- | Modules/FindJNI.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index d9395b8..5d70f0b 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -232,7 +232,7 @@ FIND_PATH(JAVA_AWT_INCLUDE_PATH jawt.h ${JAVA_INCLUDE_PATH} ) -INCLUDE("${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake") +INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(JNI DEFAULT_MSG JAVA_AWT_LIBRARY JAVA_JVM_LIBRARY JAVA_INCLUDE_PATH JAVA_INCLUDE_PATH2 JAVA_AWT_INCLUDE_PATH) |