mirror of
				https://github.com/eclipse/upm.git
				synced 2025-11-04 09:05:34 +03:00 
			
		
		
		
	cmake: Consolidated BUILDJAVAEXAMPLES and BUILDEXAMPLES
The java examples will now build if BUILDSWIGJAVA=on and
BUILDEXAMPLES=on.  This is similar to the C/C++ examples.
    * Replaced BUILDJAVAEXAMPLES w/BUILDEXAMPLES
    * Updated docs
    * Updated travis-ci
Signed-off-by: Noel Eck <noel.eck@intel.com>
			
			
This commit is contained in:
		@@ -8,8 +8,7 @@ option (BUILDFTI "Build Funtion Table Interface (FTI) in C sensor libraries" OFF
 | 
			
		||||
option (BUILDSWIGPYTHON "Build swig python modules" ON)
 | 
			
		||||
option (BUILDSWIGNODE "Build swig node modules" ON)
 | 
			
		||||
option (BUILDSWIGJAVA "Build swig java modules" OFF)
 | 
			
		||||
option (BUILDEXAMPLES "Build C/C++ example binaries" OFF)
 | 
			
		||||
option (BUILDJAVAEXAMPLES "Build java example jars" OFF)
 | 
			
		||||
option (BUILDEXAMPLES "Build C/C++/JAVA examples" OFF)
 | 
			
		||||
option (IPK "Generate IPK using CPack" OFF)
 | 
			
		||||
option (RPM "Generate RPM using CPack" OFF)
 | 
			
		||||
option (NPM "Generate NPM/GYP tarballs" OFF)
 | 
			
		||||
@@ -417,7 +416,8 @@ if(BUILDEXAMPLES)
 | 
			
		||||
  endif(BUILDCPP)
 | 
			
		||||
endif()
 | 
			
		||||
 | 
			
		||||
if(BUILDJAVAEXAMPLES)
 | 
			
		||||
# Build java examples
 | 
			
		||||
if(BUILDSWIGJAVA AND BUILDEXAMPLES)
 | 
			
		||||
  add_subdirectory (examples/java)
 | 
			
		||||
endif()
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user