diff --git a/cmake/dotnet.cmake b/cmake/dotnet.cmake index 9366fce102..c74042c04c 100644 --- a/cmake/dotnet.cmake +++ b/cmake/dotnet.cmake @@ -240,7 +240,9 @@ function(add_dotnet_test) add_custom_command( OUTPUT ${DOTNET_TEST_DIR}/${TEST_NAME}.cs COMMAND ${CMAKE_COMMAND} -E make_directory ${DOTNET_TEST_DIR} - COMMAND ${CMAKE_COMMAND} -E copy ${TEST_FILE_NAME} ${DOTNET_TEST_DIR}/ + COMMAND ${CMAKE_COMMAND} -E copy + ${TEST_FILE_NAME} + ${DOTNET_TEST_DIR}/ MAIN_DEPENDENCY ${TEST_FILE_NAME} VERBATIM WORKING_DIRECTORY ${DOTNET_TEST_DIR}) @@ -251,19 +253,19 @@ function(add_dotnet_test) ${DOTNET_EXECUTABLE} build --nologo -c Release ${TEST_NAME}.csproj COMMAND ${CMAKE_COMMAND} -E touch ${DOTNET_TEST_DIR}/timestamp DEPENDS - ${DOTNET_TEST_DIR}/${TEST_NAME}.csproj - ${DOTNET_TEST_DIR}/${TEST_NAME}.cs - dotnet_package + ${DOTNET_TEST_DIR}/${TEST_NAME}.csproj + ${DOTNET_TEST_DIR}/${TEST_NAME}.cs + dotnet_package BYPRODUCTS - ${DOTNET_TEST_DIR}/bin - ${DOTNET_TEST_DIR}/obj + ${DOTNET_TEST_DIR}/bin + ${DOTNET_TEST_DIR}/obj VERBATIM COMMENT "Compiling .Net ${COMPONENT_NAME}/${TEST_NAME}.cs (${DOTNET_TEST_DIR}/timestamp)" WORKING_DIRECTORY ${DOTNET_TEST_DIR}) add_custom_target(dotnet_${COMPONENT_NAME}_${TEST_NAME} ALL DEPENDS - ${DOTNET_TEST_DIR}/timestamp + ${DOTNET_TEST_DIR}/timestamp WORKING_DIRECTORY ${DOTNET_TEST_DIR}) if(BUILD_TESTING) @@ -697,8 +699,10 @@ if(NOT EXAMPLE_FILE_NAME) add_custom_command( OUTPUT ${DOTNET_EXAMPLE_DIR}/${EXAMPLE_NAME}.cs COMMAND ${CMAKE_COMMAND} -E make_directory ${DOTNET_EXAMPLE_DIR} - COMMAND ${CMAKE_COMMAND} -E copy ${EXAMPLE_FILE_NAME} ${DOTNET_EXAMPLE_DIR}/ - MAIN_DEPENDENCY ${EXAMPLE_FILE_NAME} + COMMAND ${CMAKE_COMMAND} -E copy + ${EXAMPLE_FILE_NAME} + ${DOTNET_EXAMPLE_DIR}/ + MAIN_DEPENDENCY ${EXAMPLE_FILE_NAME} VERBATIM WORKING_DIRECTORY ${DOTNET_EXAMPLE_DIR}) diff --git a/cmake/java.cmake b/cmake/java.cmake index d9281acdea..74184c1f4f 100644 --- a/cmake/java.cmake +++ b/cmake/java.cmake @@ -206,11 +206,13 @@ function(add_java_test) add_custom_command( OUTPUT ${JAVA_TEST_DIR}/${JAVA_TEST_PATH}/${TEST_NAME}.java COMMAND ${CMAKE_COMMAND} -E make_directory - ${JAVA_TEST_DIR}/${JAVA_TEST_PATH} - COMMAND ${CMAKE_COMMAND} -E copy ${TEST_FILE_NAME} ${JAVA_TEST_DIR}/${JAVA_TEST_PATH}/ + ${JAVA_TEST_DIR}/${JAVA_TEST_PATH} + COMMAND ${CMAKE_COMMAND} -E copy + ${TEST_FILE_NAME} + ${JAVA_TEST_DIR}/${JAVA_TEST_PATH}/ MAIN_DEPENDENCY ${TEST_FILE_NAME} VERBATIM - ) + ) string(TOLOWER ${TEST_NAME} JAVA_TEST_PROJECT) configure_file( @@ -223,17 +225,17 @@ function(add_java_test) COMMAND ${MAVEN_EXECUTABLE} compile -B COMMAND ${CMAKE_COMMAND} -E touch ${JAVA_TEST_DIR}/timestamp DEPENDS - ${JAVA_TEST_DIR}/pom.xml - ${JAVA_TEST_DIR}/${JAVA_TEST_PATH}/${TEST_NAME}.java - java_package + ${JAVA_TEST_DIR}/pom.xml + ${JAVA_TEST_DIR}/${JAVA_TEST_PATH}/${TEST_NAME}.java + java_package BYPRODUCTS - ${JAVA_TEST_DIR}/target + ${JAVA_TEST_DIR}/target COMMENT "Compiling Java ${COMPONENT_NAME}/${TEST_NAME}.java (${JAVA_TEST_DIR}/timestamp)" WORKING_DIRECTORY ${JAVA_TEST_DIR}) add_custom_target(java_${COMPONENT_NAME}_${TEST_NAME} ALL DEPENDS - ${JAVA_TEST_DIR}/timestamp + ${JAVA_TEST_DIR}/timestamp WORKING_DIRECTORY ${JAVA_TEST_DIR}) if(BUILD_TESTING) @@ -655,8 +657,10 @@ function(add_java_sample) OUTPUT ${SAMPLE_DIR}/${JAVA_SRC_PATH}/${COMPONENT_NAME_LOWER}/samples/${SAMPLE_NAME}.java COMMAND ${CMAKE_COMMAND} -E make_directory ${SAMPLE_DIR}/${JAVA_SRC_PATH}/${COMPONENT_NAME_LOWER}/samples - COMMAND ${CMAKE_COMMAND} -E copy ${SAMPLE_FILE_NAME} ${SAMPLE_DIR}/${JAVA_SRC_PATH}/${COMPONENT_NAME_LOWER}/samples/ - MAIN_DEPENDENCY ${SAMPLE_FILE_NAME} + COMMAND ${CMAKE_COMMAND} -E copy + ${SAMPLE_FILE_NAME} + ${SAMPLE_DIR}/${JAVA_SRC_PATH}/${COMPONENT_NAME_LOWER}/samples/ + MAIN_DEPENDENCY ${SAMPLE_FILE_NAME} VERBATIM ) @@ -743,8 +747,10 @@ if(NOT EXAMPLE_FILE_NAME) OUTPUT ${JAVA_EXAMPLE_DIR}/${JAVA_SRC_PATH}/${COMPONENT_NAME}/${EXAMPLE_NAME}.java COMMAND ${CMAKE_COMMAND} -E make_directory ${JAVA_EXAMPLE_DIR}/${JAVA_SRC_PATH}/${COMPONENT_NAME} - COMMAND ${CMAKE_COMMAND} -E copy ${EXAMPLE_FILE_NAME} ${JAVA_EXAMPLE_DIR}/${JAVA_SRC_PATH}/${COMPONENT_NAME}/ - MAIN_DEPENDENCY ${EXAMPLE_FILE_NAME} + COMMAND ${CMAKE_COMMAND} -E copy + ${EXAMPLE_FILE_NAME} + ${JAVA_EXAMPLE_DIR}/${JAVA_SRC_PATH}/${COMPONENT_NAME}/ + MAIN_DEPENDENCY ${EXAMPLE_FILE_NAME} VERBATIM ) diff --git a/cmake/python.cmake b/cmake/python.cmake index 282f979efe..2112ceeb66 100644 --- a/cmake/python.cmake +++ b/cmake/python.cmake @@ -633,8 +633,8 @@ add_custom_command( ${PYTHON_PROJECT}/.libs COMMAND ${CMAKE_COMMAND} -E - $,copy,true> - $<${need_unix_scip_lib}:$> + $,copy,true> + $<${need_unix_scip_lib}:$> $<${need_windows_scip_lib}:$> ${PYTHON_PROJECT}/.libs