From: <fbe...@us...> - 2010-12-30 19:27:22
|
Revision: 12490 http://sbml.svn.sourceforge.net/sbml/?rev=12490&view=rev Author: fbergmann Date: 2010-12-30 19:27:16 +0000 (Thu, 30 Dec 2010) Log Message: ----------- - java test runner could not be build with VS, as the resulting command was too long, using relative paths instead. Modified Paths: -------------- branches/libsbml-5/src/bindings/java/CMakeLists.txt Modified: branches/libsbml-5/src/bindings/java/CMakeLists.txt =================================================================== --- branches/libsbml-5/src/bindings/java/CMakeLists.txt 2010-12-30 18:55:22 UTC (rev 12489) +++ branches/libsbml-5/src/bindings/java/CMakeLists.txt 2010-12-30 19:27:16 UTC (rev 12490) @@ -166,9 +166,12 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/test DESTINATION ${CMAKE_CURRENT_BINARY_DIR} PATTERN *.java ) # copy test runner source file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/AutoTestRunner.java DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) - # enumerate test files - file(GLOB_RECURSE JAVA_TEST_FILES ${CMAKE_CURRENT_BINARY_DIR}/test/*.java) + # + # enumerate test files (this needs to be relative otherwise the path will be too long!) + # + file(GLOB_RECURSE JAVA_TEST_FILES RELATIVE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/test/*.java) + set(JAVA_TEST_FILES ${JAVA_TEST_FILES} ${CMAKE_CURRENT_BINARY_DIR}/AutoTestRunner.java) set(JAVA_NATIVE_FILES) @@ -180,6 +183,7 @@ file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/libsbmlj.jar jar_file) file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR} current_dir) file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/test test_dir) + #compile tests ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/AutoTestRunner.class ${CMAKE_CURRENT_BINARY_DIR}/TestFilenameFilter.class @@ -192,6 +196,7 @@ ) add_custom_target(binding_java_test_runner ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/AutoTestRunner.class) + add_dependencies(binding_java_test_runner binding_java_jar) # run tests add_test(test_java_binding "${Java_JAVA_EXECUTABLE}" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |