diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-08 16:03:53 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-08 16:03:53 +0300 |
| commit | f4425d3a3dbe5638daceb41dca4dfdb5eba1ffaf (patch) | |
| tree | 88134dff388f88041cd557eb53bc262667f51f96 /cmake | |
| parent | bf5c050fd28f616d789a02b0fbd6fd8ff53c78d3 (diff) | |
| parent | b8d38c5e39d526e006f4e8e8977ac4c6166bc4c6 (diff) | |
| download | mariadb-git-f4425d3a3dbe5638daceb41dca4dfdb5eba1ffaf.tar.gz | |
Merge 10.4 into 10.5
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() |