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

No extra spaces in CustomCommand test (#9963) 

The nightly dashboard showed that the following
platforms had difficulties dealing with "bin dir"
and/or "check command line" as directory and
file names:

  AIX
  Borland 5.5, 5.6 and 5.8
  IRIX
  NMake 6.0
  OpenBSD
  VS 7.1
  Watcom

Re-visit later, after the release, to use spaces
in the bin dir and in the target name where possible.
This commit is contained in:
David Cole 2010-09-12 05:01:35 -04:00
parent 269a4b876a
commit 9d2e6489bf
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/CMakeLists.txt
View File

@ -376,7 +376,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
--build-generator ${CMAKE_TEST_GENERATOR} --build-generator ${CMAKE_TEST_GENERATOR}
--build-project CustomCommand --build-project CustomCommand
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
--build-exe-dir "${CMake_BINARY_DIR}/Tests/CustomCommand/bin dir" --build-exe-dir "${CMake_BINARY_DIR}/Tests/CustomCommand/bin"
--test-command CustomCommand --test-command CustomCommand
) )
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/CustomCommand") LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/CustomCommand")

15
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 dir" 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 dir" CACHE INTERNAL ${PROJECT_BINARY_DIR}/${bin_dir} CACHE INTERNAL
"Single output directory for building all executables.") "Single output directory for building all executables.")
################################################################ ################################################################
@ -362,15 +366,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 SET_PROPERTY(TARGET check_command_line
PROPERTY OUTPUT_NAME "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)"
@ -380,7 +385,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$)"