java: Added sanity checks and integrated them in CMake. Updated sample names and sample mapping.

Signed-off-by: Stefan Andritoiu <stefan.andritoiu@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Stefan Andritoiu
2016-01-13 13:38:23 +02:00
committed by Mihai Tudor Panu
parent 46996e5251
commit 40f9135412
14 changed files with 335 additions and 60 deletions

View File

@ -1,3 +1,14 @@
macro (file_to_list readfile outlist)
FILE(READ "${readfile}" contents)
STRING(REGEX REPLACE ";" "\\\\;" contents "${contents}")
STRING(REGEX REPLACE "\n" ";" contents "${contents}")
set("${outlist}" "${contents}" )
endmacro()
file_to_list ("javaswig_blacklist" JAVASWIG_BLACKLIST)
file_to_list ("pythonswig_blacklist" PYTHONSWIG_BLACKLIST)
file_to_list ("nodeswig_blacklist" NODESWIG_BLACKLIST)
macro(subdirlist result curdir)
file(GLOB children RELATIVE ${curdir} ${curdir}/*)
set(dirlist "")
@ -159,9 +170,6 @@ if (SWIG_FOUND)
endmacro()
endif(BUILDSWIGNODE)
# if(BUILDSWIGJAVA)
# add_subdirectory (java)
# endif(BUILDSWIGJAVA)
endif()
@ -181,9 +189,15 @@ macro(upm_module_init)
)
upm_create_install_pkgconfig (upm-${libname}.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
if (SWIG_FOUND)
upm_swig_python()
upm_swig_node()
upm_swig_java()
if (NOT ";${PYTHONSWIG_BLACKLIST};" MATCHES ";${libname};")
upm_swig_python()
endif()
if (NOT ";${NODESWIG_BLACKLIST};" MATCHES ";${libname};")
upm_swig_node()
endif()
if (NOT ";${JAVASWIG_BLACKLIST};" MATCHES ";${libname};")
upm_swig_java()
endif()
endif()
if (BUILDDOC)
upm_doxygen()