From e1b2f593d6463674b9bb5be20f3da9570759993f Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Fri, 1 Nov 2013 19:30:58 +0100 Subject: [PATCH 1/3] fix crash when path has spaces The paths are defined properly with an escape "\ " but you cannot have an escape and quotes when piping (otherwise, escapes are understood as 2 characters). So just remove the quotes. --- modules/java/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt index a4d895a6b..52193bea2 100644 --- a/modules/java/CMakeLists.txt +++ b/modules/java/CMakeLists.txt @@ -134,7 +134,7 @@ endforeach() set(step2_depends ${step1_depends} ${scripts_gen_javadoc} ${scripts_rst_parser} ${javadoc_rst_sources} ${generated_java_sources} ${handwrittren_java_sources}) string(REPLACE ";" "," OPENCV_JAVA_MODULES_STR "${OPENCV_JAVA_MODULES}") add_custom_command(OUTPUT ${documented_java_files} - COMMAND ${PYTHON_EXECUTABLE} "${scripts_gen_javadoc}" --modules ${OPENCV_JAVA_MODULES_STR} "${CMAKE_CURRENT_SOURCE_DIR}/generator/src/java" "${CMAKE_CURRENT_BINARY_DIR}" 2>"${CMAKE_CURRENT_BINARY_DIR}/get_javadoc_errors.log" + COMMAND ${PYTHON_EXECUTABLE} "${scripts_gen_javadoc}" --modules ${OPENCV_JAVA_MODULES_STR} "${CMAKE_CURRENT_SOURCE_DIR}/generator/src/java" "${CMAKE_CURRENT_BINARY_DIR}" 2>${CMAKE_CURRENT_BINARY_DIR}/get_javadoc_errors.log WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${step2_depends} ) From 3b0108e4c11c2b0db8acad8523060f7588b2ed95 Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Tue, 5 Nov 2013 11:18:20 +0100 Subject: [PATCH 2/3] fix the crash as suggested by @SpecLad --- modules/java/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt index 52193bea2..8e8ed1059 100644 --- a/modules/java/CMakeLists.txt +++ b/modules/java/CMakeLists.txt @@ -134,7 +134,7 @@ endforeach() set(step2_depends ${step1_depends} ${scripts_gen_javadoc} ${scripts_rst_parser} ${javadoc_rst_sources} ${generated_java_sources} ${handwrittren_java_sources}) string(REPLACE ";" "," OPENCV_JAVA_MODULES_STR "${OPENCV_JAVA_MODULES}") add_custom_command(OUTPUT ${documented_java_files} - COMMAND ${PYTHON_EXECUTABLE} "${scripts_gen_javadoc}" --modules ${OPENCV_JAVA_MODULES_STR} "${CMAKE_CURRENT_SOURCE_DIR}/generator/src/java" "${CMAKE_CURRENT_BINARY_DIR}" 2>${CMAKE_CURRENT_BINARY_DIR}/get_javadoc_errors.log + COMMAND ${PYTHON_EXECUTABLE} "${scripts_gen_javadoc}" --modules ${OPENCV_JAVA_MODULES_STR} "${CMAKE_CURRENT_SOURCE_DIR}/generator/src/java" "${CMAKE_CURRENT_BINARY_DIR}" 2> "${CMAKE_CURRENT_BINARY_DIR}/get_javadoc_errors.log" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${step2_depends} ) From 0b1df622156fbf4e071b631475fa3e400ba77a9a Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Tue, 5 Nov 2013 12:02:22 +0100 Subject: [PATCH 3/3] add VERBATIM as advised by @SpecLad --- modules/java/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt index 8e8ed1059..936c160e8 100644 --- a/modules/java/CMakeLists.txt +++ b/modules/java/CMakeLists.txt @@ -137,6 +137,7 @@ add_custom_command(OUTPUT ${documented_java_files} COMMAND ${PYTHON_EXECUTABLE} "${scripts_gen_javadoc}" --modules ${OPENCV_JAVA_MODULES_STR} "${CMAKE_CURRENT_SOURCE_DIR}/generator/src/java" "${CMAKE_CURRENT_BINARY_DIR}" 2> "${CMAKE_CURRENT_BINARY_DIR}/get_javadoc_errors.log" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${step2_depends} + VERBATIM ) # step 3: copy files to destination