kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-9963' 

a798bb7 Avoid CustomCommand test failure on VS71 (#9963)
9b4ab06 Avoid CustomCommand test failure on VS71 (#9963)
9d2e648 No extra spaces in CustomCommand test (#9963)
269a4b8 Enable calling commands with : in argv[1] (#9963)
This commit is contained in:
Brad King 2010-09-21 10:44:08 -04:00 committed by CMake Topic Stage
parent 5968785b2f a798bb7074
commit 781c34197b
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -1062,10 +1062,17 @@ cmLocalUnixMakefileGenerator3
} }
} }
} }
if (useCall && launcher.empty()) if (launcher.empty())
{
if (useCall)
{ {
cmd = "call " + cmd; cmd = "call " + cmd;
} }
else if (this->NMake && cmd[0]=='"')
{
cmd = "echo >nul && " + cmd;
}
}
commands1.push_back(cmd); commands1.push_back(cmd);
} }
} }

20
Tests/CustomCommand/CMakeLists.txt
View File

@ -9,12 +9,16 @@ ADD_SUBDIRECTORY(GeneratedHeader)
# #
# Lib and exe path # Lib and exe path
# #
IF(NOT DEFINED bin_dir)
SET(bin_dir "bin")
ENDIF()
SET (LIBRARY_OUTPUT_PATH SET (LIBRARY_OUTPUT_PATH
${PROJECT_BINARY_DIR}/bin/ CACHE INTERNAL ${PROJECT_BINARY_DIR}/${bin_dir} CACHE INTERNAL
"Single output directory for building all libraries.") "Single output directory for building all libraries.")
SET (EXECUTABLE_OUTPUT_PATH SET (EXECUTABLE_OUTPUT_PATH
${PROJECT_BINARY_DIR}/bin/ CACHE INTERNAL ${PROJECT_BINARY_DIR}/${bin_dir} CACHE INTERNAL
"Single output directory for building all executables.") "Single output directory for building all executables.")
################################################################ ################################################################
@ -220,7 +224,12 @@ ADD_CUSTOM_COMMAND(OUTPUT gen_redirect.c
############################################################################## ##############################################################################
# Test non-trivial command line arguments in custom commands. # Test non-trivial command line arguments in custom commands.
SET(EXPECTED_ARGUMENTS) SET(EXPECTED_ARGUMENTS)
SET(CHECK_ARGS)
IF(NOT MSVC71)
SET(CHECK_ARGS -DPATH=c:/posix/path)
ENDIF()
SET(CHECK_ARGS SET(CHECK_ARGS
${CHECK_ARGS}
c:/posix/path c:/posix/path
c:\\windows\\path c:\\windows\\path
'single-quotes' 'single-quotes'
@ -359,13 +368,16 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/check_command_line.c.in
@ONLY IMMEDIATE) @ONLY IMMEDIATE)
ADD_EXECUTABLE(check_command_line ADD_EXECUTABLE(check_command_line
${CMAKE_CURRENT_BINARY_DIR}/check_command_line.c) ${CMAKE_CURRENT_BINARY_DIR}/check_command_line.c)
SET(output_name "check_command_line")
SET_PROPERTY(TARGET check_command_line
PROPERTY OUTPUT_NAME ${output_name})
# SET_TARGET_PROPERTIES(check_command_line PROPERTIES # SET_TARGET_PROPERTIES(check_command_line PROPERTIES
# COMPILE_FLAGS -DCHECK_COMMAND_LINE_VERBOSE) # COMPILE_FLAGS -DCHECK_COMMAND_LINE_VERBOSE)
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/command_line_check OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/command_line_check
COMMAND ${CMAKE_COMMAND} -DMARK_FILE=${CMAKE_CURRENT_BINARY_DIR}/check_mark.txt COMMAND ${CMAKE_COMMAND} -DMARK_FILE=${CMAKE_CURRENT_BINARY_DIR}/check_mark.txt
-P ${CMAKE_CURRENT_SOURCE_DIR}/check_mark.cmake -P ${CMAKE_CURRENT_SOURCE_DIR}/check_mark.cmake
COMMAND ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/check_command_line COMMAND ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/${output_name}
${CHECK_ARGS} "" ${CHECK_ARGS} ""
VERBATIM VERBATIM
COMMENT "Checking custom command line escapes (single'quote)" COMMENT "Checking custom command line escapes (single'quote)"
@ -375,7 +387,7 @@ SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/command_line_check
ADD_CUSTOM_TARGET(do_check_command_line ALL ADD_CUSTOM_TARGET(do_check_command_line ALL
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/command_line_check DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/command_line_check
COMMAND ${CMAKE_COMMAND} -E echo "Checking custom target command escapes" COMMAND ${CMAKE_COMMAND} -E echo "Checking custom target command escapes"
COMMAND ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/check_command_line COMMAND ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/${output_name}
${CHECK_ARGS} "" ${CHECK_ARGS} ""
VERBATIM VERBATIM
COMMENT "Checking custom target command line escapes ($dollar-signs$)" COMMENT "Checking custom target command line escapes ($dollar-signs$)"