diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-07-15 10:59:45 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-07-15 10:59:45 (GMT) |
| commit | 445751d34fae13c231fae3db10cbac6468f003d8 (patch) | |
| tree | 96f02259a5f55ff074a46ad63e46ddf5a441f4d0 /src/bindings | |
| parent | d56955bcd629d47333a3b1c65e9d507063f51cbf (diff) | |
| download | uscxml-445751d34fae13c231fae3db10cbac6468f003d8.zip uscxml-445751d34fae13c231fae3db10cbac6468f003d8.tar.gz uscxml-445751d34fae13c231fae3db10cbac6468f003d8.tar.bz2 | |
Small fix for java bindings
Diffstat (limited to 'src/bindings')
| -rw-r--r-- | src/bindings/swig/java/CMakeLists.txt | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/bindings/swig/java/CMakeLists.txt b/src/bindings/swig/java/CMakeLists.txt index 16295a1..86f2fd6 100644 --- a/src/bindings/swig/java/CMakeLists.txt +++ b/src/bindings/swig/java/CMakeLists.txt @@ -8,11 +8,6 @@ else() message(STATUS "No JNI libraries found - not building Java wrappers") return() endif() -FIND_PROGRAM(ANT_EXECUTABLE ant PATHS $ENV{ANT_HOME}/bin ENV PATH ) -if (NOT ANT_EXECUTABLE) - message(STATUS "No apache ant found - not building Java wrappers") - return() -endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR}) @@ -25,8 +20,6 @@ SET_SOURCE_FILES_PROPERTIES(uscxml.i PROPERTIES SWIG_FLAGS "-w473;-package;${USC SET_SOURCE_FILES_PROPERTIES(uscxml.i PROPERTIES CPLUSPLUS ON) SET(CMAKE_SWIG_OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/${USCXML_JAVA_DIR}") -set(USCXML_LANGUAGE_BINDINGS "java ${USCXML_LANGUAGE_BINDINGS}") - SWIG_ADD_MODULE(uscxmlNativeJava java uscxml.i) foreach(JNI_LIBRARY ${JNI_LIBRARIES}) if (NOT ${JNI_LIBRARY} MATCHES ".*jawt.*") @@ -37,9 +30,10 @@ set_target_properties(uscxmlNativeJava PROPERTIES FOLDER "Bindings") set_target_properties(uscxmlNativeJava PROPERTIES COMPILE_FLAGS "-DSWIG") swig_link_libraries(uscxmlNativeJava uscxml) -set(USCXML_LANGUAGE_BINDINGS ${USCXML_LANGUAGE_BINDINGS} PARENT_SCOPE) if (ANT_EXECUTABLE) + set(USCXML_LANGUAGE_BINDINGS "java ${USCXML_LANGUAGE_BINDINGS}") + set(JAR_EXCLUDE_DEBUG OFF) set(JAR_EXCLUDE_JNI OFF) @@ -76,4 +70,6 @@ if (ANT_EXECUTABLE) set_target_properties(java PROPERTIES FOLDER "Bindings") else() message(STATUS "Could not find ant binary - will not build jars") -endif()
\ No newline at end of file +endif() + +set(USCXML_LANGUAGE_BINDINGS ${USCXML_LANGUAGE_BINDINGS} PARENT_SCOPE) |