alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: Check for JAVA in top-level CMakeLists.txt

Browse Source 
Moved require for Java/JNI/mraajava to top-level CMakeLists.txt
which will fail early if these are NOT found (vs failing in
the src-level CMakeLists.txt

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck 2016-11-29 15:14:32 -08:00
parent 09144e712b
commit 232089f400
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -138,6 +138,13 @@ if (BUILDSWIGNODE)
find_package (Node REQUIRED) find_package (Node REQUIRED)
endif (BUILDSWIGNODE) endif (BUILDSWIGNODE)
# Find JAVA/JNI
if (BUILDSWIGJAVA)
find_package (Java REQUIRED)
find_package (JNI REQUIRED)
pkg_check_modules (MRAAJAVA REQUIRED mraajava>=0.8.0)
endif (BUILDSWIGJAVA)
# Find swig if any wrapper is enabled # Find swig if any wrapper is enabled
if (BUILDSWIGPYTHON OR BUILDSWIGNODE OR BUILDSWIGJAVA) if (BUILDSWIGPYTHON OR BUILDSWIGNODE OR BUILDSWIGJAVA)
find_package (SWIG 3.0.5 REQUIRED) find_package (SWIG 3.0.5 REQUIRED)

3
src/CMakeLists.txt
View File

@ -221,9 +221,6 @@ endmacro(upm_swig_node)
macro(upm_swig_java) macro(upm_swig_java)
# Skip if the libname is in the blacklist # Skip if the libname is in the blacklist
if (NOT ";${JAVASWIG_BLACKLIST};" MATCHES ";${libname};") if (NOT ";${JAVASWIG_BLACKLIST};" MATCHES ";${libname};")
FIND_PACKAGE (JNI REQUIRED)
pkg_check_modules (MRAAJAVA REQUIRED mraajava>=0.8.0)
include_directories ( include_directories (
${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}
${JAVA_INCLUDE_PATH2} ${JAVA_INCLUDE_PATH2}