JAVA: Unified Java Example names
Unified all Java examples to *match* <LIBRARY>[_otherstuf]_Example.java.
Note, a handful of the examples have a pseudo-random string for the
first component (see FlexSensor_Example.java, ideally this would be
Flex_Example.java).
This commit allows for quick development on a single sensor library
since a -DMODULE_LIST=mysensorlib now works with Java examples
(previously Java examples would fail generation when using
MODULE_LIST).
* Renamed examples
* Updated class names
* Updated library descriptor .json files
* Updated sample mapping file
TODO: Make this work like the C/C++ examples - grab the target library
name from the filename and grab all dependencies from that target
library. Fix the handful of example names which don't conform.
Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
@@ -53,8 +53,8 @@ function (_get_dependency_targets target return_variable)
|
||||
# Get the LINK_LIBRARIES property of the target
|
||||
get_target_property(_dep_libs ${target} LINK_LIBRARIES)
|
||||
|
||||
# Remove this libname from the _dep_libs (if it exists)
|
||||
list(REMOVE_ITEM _dep_libs ${libname})
|
||||
# Remove this target from the _dep_libs (if it exists)
|
||||
list(REMOVE_ITEM _dep_libs ${target})
|
||||
|
||||
# Check if any of the LINK_LIBRARIES are targets in this project,
|
||||
# if so, add them to ${return_variable}
|
||||
@@ -576,6 +576,10 @@ function(upm_swig_java)
|
||||
COMMAND ${JAR} cf upm_${libname}.jar upm_${libname}
|
||||
)
|
||||
|
||||
# Save the absolute path of the jar file as a property of this java target
|
||||
set_target_properties (javaupm_${libname} PROPERTIES
|
||||
JAR_FILE_ABSOLUTE ${CMAKE_CURRENT_BINARY_DIR}/upm_${libname}.jar)
|
||||
|
||||
# Keep track of all JAVA targets
|
||||
set(UPM_TARGETS_JAVA ${UPM_TARGETS_JAVA} javaupm_${libname} CACHE INTERNAL "List of JAVA target names")
|
||||
endif (NOT ";${JAVASWIG_BLACKLIST};" MATCHES ";${libname};")
|
||||
|
||||
Reference in New Issue
Block a user