diff options
| author | Brad King <brad.king@kitware.com> | 2015-12-07 14:22:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-12-07 14:22:45 (GMT) |
| commit | 8ff907113792d4554b2837afa7102427572997d1 (patch) | |
| tree | 040dba8e55316fc6848f02c638d86daf2d14e958 | |
| parent | c3bb76dfd2bc732acb8d69ef47dacce9a55a6582 (diff) | |
| parent | 4d4fcabdfd9ceb02d947f6631370f6091e1ed337 (diff) | |
| download | CMake-8ff907113792d4554b2837afa7102427572997d1.zip CMake-8ff907113792d4554b2837afa7102427572997d1.tar.gz CMake-8ff907113792d4554b2837afa7102427572997d1.tar.bz2 | |
Merge topic 'FindJNI-aix'
4d4fcabd FindJNI: Add support for AIX java sdk
| -rw-r--r-- | Modules/FindJNI.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index cbe21d7..135038c 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -63,7 +63,7 @@ macro(java_append_library_directories _var) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") set(_java_libarch "ppc64" "ppc") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") - set(_java_libarch "ppc") + set(_java_libarch "ppc" "ppc64") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc") # Both flavours can run on the same processor set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "sparc" "sparcv9") @@ -271,7 +271,8 @@ find_path(JAVA_INCLUDE_PATH jni.h ${JAVA_AWT_INCLUDE_DIRECTORIES} ) -find_path(JAVA_INCLUDE_PATH2 jni_md.h +find_path(JAVA_INCLUDE_PATH2 NAMES jni_md.h jniport.h + PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/darwin ${JAVA_INCLUDE_PATH}/win32 @@ -281,6 +282,7 @@ find_path(JAVA_INCLUDE_PATH2 jni_md.h ${JAVA_INCLUDE_PATH}/solaris ${JAVA_INCLUDE_PATH}/hp-ux ${JAVA_INCLUDE_PATH}/alpha + ${JAVA_INCLUDE_PATH}/aix ) find_path(JAVA_AWT_INCLUDE_PATH jawt.h |