From 18943afb8bf40a4f071927081008cdcff128a863 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 28 May 2014 13:27:51 +0200 Subject: [PATCH] Gory hack (try #2). Semicolons are used both as list separator for cmake, and as path separator for classpath on Windows. Since the cmake language doesn't permit to escape them properly, try to use substitutions to make the java tests work on Windows. --- buildtools/Cmake/AddTests.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index a42b620c3d..3181c4ac41 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -38,6 +38,9 @@ ENDIF() MACRO(ADD_TESH NAME) SET(ARGR ${ARGV}) LIST(REMOVE_AT ARGR 0) + IF(WIN32) + STRING(REPLACE "§" "\;" ARGR "${ARGR}") + ENDIF() ADD_TEST(${NAME} ${TESH_COMMAND} ${TESH_OPTION} ${ARGR}) ENDMACRO() @@ -476,6 +479,7 @@ IF(NOT enable_memcheck) IF(enable_java) IF(WIN32) SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/java/\;${SIMGRID_FULL_JAR}") + STRING(REPLACE "\;" "§" TESH_CLASSPATH "${TESH_CLASSPATH}") ELSE() SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/java/:${SIMGRID_FULL_JAR}") ENDIF() @@ -508,6 +512,7 @@ IF(NOT enable_memcheck) IF(enable_scala) IF(WIN32) SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/scala/\;${SIMGRID_FULL_JAR}\;${SCALA_JARS}") + STRING(REPLACE "\;" "§" TESH_CLASSPATH "${TESH_CLASSPATH}") ELSE() SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/scala/:${SIMGRID_FULL_JAR}:${SCALA_JARS}") ENDIF() -- 2.20.1