diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-08 14:33:07 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-08 14:33:07 +0300 |
| commit | 6e9642beb2cafecbcb96e591e1b4466b877d4885 (patch) | |
| tree | 39aa60527982a3a91946c9c6e0608992a309f178 /cmake | |
| parent | 8149e4d0a139b901c8902b5b9fae371cef47275f (diff) | |
| parent | dfa2d0bc13362b949b1b1699955583f74e7db90a (diff) | |
| download | mariadb-git-6e9642beb2cafecbcb96e591e1b4466b877d4885.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindJNI.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/FindJNI.cmake b/cmake/FindJNI.cmake index 12305d7c86d..b2c6f849c87 100644 --- a/cmake/FindJNI.cmake +++ b/cmake/FindJNI.cmake @@ -1,4 +1,4 @@ -if(JAVA_AWT_LIBRARY) +if(JAVA_AWT_LIBRARY AND JAVA_INCLUDE_PATH) set(JNI_FOUND TRUE) return() endif() |