diff options
author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-11-15 21:44:59 (GMT) |
---|---|---|
committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-11-15 21:44:59 (GMT) |
commit | d2e90c02e5ad19a5857e7c7fb87f248182fdb32d (patch) | |
tree | e070363aea3eee493b30e378ba39bfd6250f2088 /src/bindings | |
parent | 8c84c3550ad13ec19b6340bd8e9633aee91156af (diff) | |
download | uscxml-d2e90c02e5ad19a5857e7c7fb87f248182fdb32d.zip uscxml-d2e90c02e5ad19a5857e7c7fb87f248182fdb32d.tar.gz uscxml-d2e90c02e5ad19a5857e7c7fb87f248182fdb32d.tar.bz2 |
Fixed file:// handling bug on windows
Diffstat (limited to 'src/bindings')
-rw-r--r-- | src/bindings/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/bindings/swig/java/CMakeLists.txt | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/bindings/CMakeLists.txt b/src/bindings/CMakeLists.txt index 25c11a1..edddc31 100644 --- a/src/bindings/CMakeLists.txt +++ b/src/bindings/CMakeLists.txt @@ -11,8 +11,9 @@ if (WIN32) LIST(APPEND CMAKE_PROGRAM_PATH "${PROJECT_BINARY_DIR}/../../swig/") endif() - LIST(APPEND CMAKE_PROGRAM_PATH "C:/Program Files/swig") # swig.exe - LIST(APPEND CMAKE_PROGRAM_PATH "C:/Program Files (x86)/swig") # swig.exe + file(GLOB POTENTIAL_SWIG "C:/Program Files/swig*" "C:/Program Files (x86)/swig*") + LIST(APPEND CMAKE_PROGRAM_PATH ${POTENTIAL_SWIG}) # swig.exe + # message(FATAL_ERROR "POTENTIAL_SWIG: ${POTENTIAL_SWIG}") endif() LIST(APPEND CMAKE_PROGRAM_PATH $ENV{SWIG_DIR}) @@ -29,7 +30,7 @@ if (SWIG_FOUND) message(STATUS "SWIG version > 3.0 is recommended, found ${SWIG_VERSION}") endif() else() - message(STATUS "SWIG version 2.0.5 is required, found ${SWIG_VERSION} - skipping java wrapper generation") + message(STATUS "SWIG version 2.0.5 is required, found ${SWIG_VERSION} - skipping wrapper generation") endif() else() message(STATUS "SWIG not found - skipping wrapper generation") diff --git a/src/bindings/swig/java/CMakeLists.txt b/src/bindings/swig/java/CMakeLists.txt index eb51f83..de2a161 100644 --- a/src/bindings/swig/java/CMakeLists.txt +++ b/src/bindings/swig/java/CMakeLists.txt @@ -31,7 +31,9 @@ set_target_properties(uscxmlNativeJava PROPERTIES COMPILE_FLAGS "-DSWIG") swig_link_libraries(uscxmlNativeJava uscxml) -FIND_PROGRAM(ANT_EXECUTABLE ant PATHS $ENV{ANT_HOME}/bin ENV PATH ) +file(GLOB POTENTIAL_ANT "C:/Program Files/apache-ant**/bin" "C:/Program Files (x86)/apache-ant**/bin") + +FIND_PROGRAM(ANT_EXECUTABLE ant PATHS $ENV{ANT_HOME}/bin ${POTENTIAL_ANT} ENV PATH ) if (ANT_EXECUTABLE) set(USCXML_LANGUAGE_BINDINGS "java ${USCXML_LANGUAGE_BINDINGS}") |