[Cmake-commits] CMake branch, next, updated. v2.8.2-751-g9c22a2f

[David Cole]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9c22a2f489de5bd01b15a04cedfc3b523ae421ad (commit)
       via  9d2e6489bf8e5087957ef578174e3b0516c32a50 (commit)
      from  49acea5d2db4ffdbcc8daed569bd016d21b53954 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c22a2f489de5bd01b15a04cedfc3b523ae421ad
commit 9c22a2f489de5bd01b15a04cedfc3b523ae421ad
Merge: 49acea5 9d2e648
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Sun Sep 12 05:19:38 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Sep 12 05:19:38 2010 -0400

    Merge topic 'fix-9963' into next
    
    9d2e648 No extra spaces in CustomCommand test (#9963)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d2e6489bf8e5087957ef578174e3b0516c32a50
commit 9d2e6489bf8e5087957ef578174e3b0516c32a50
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Sun Sep 12 05:01:35 2010 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Sun Sep 12 05:01:35 2010 -0400

    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.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index e4c979e..8e8d0ca 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -376,7 +376,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     --build-generator ${CMAKE_TEST_GENERATOR}
     --build-project CustomCommand
     --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
     )
   LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/CustomCommand")
diff --git a/Tests/CustomCommand/CMakeLists.txt b/Tests/CustomCommand/CMakeLists.txt
index 6664fd6..c6f6a7f 100644
--- a/Tests/CustomCommand/CMakeLists.txt
+++ b/Tests/CustomCommand/CMakeLists.txt
@@ -9,12 +9,16 @@ ADD_SUBDIRECTORY(GeneratedHeader)
 #
 # Lib and exe path
 #
+IF(NOT DEFINED bin_dir)
+  SET(bin_dir "bin")
+ENDIF()
+
 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.")
 
 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.")
 
 ################################################################
@@ -362,15 +366,16 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/check_command_line.c.in
                @ONLY IMMEDIATE)
 ADD_EXECUTABLE(check_command_line
   ${CMAKE_CURRENT_BINARY_DIR}/check_command_line.c)
+SET(output_name "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
 #   COMPILE_FLAGS -DCHECK_COMMAND_LINE_VERBOSE)
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/command_line_check
   COMMAND ${CMAKE_COMMAND} -DMARK_FILE=${CMAKE_CURRENT_BINARY_DIR}/check_mark.txt
   -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} ""
   VERBATIM
   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
   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/command_line_check
   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} ""
   VERBATIM
   COMMENT "Checking custom target command line escapes ($dollar-signs$)"

-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeLists.txt               |    2 +-
 Tests/CustomCommand/CMakeLists.txt |   15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake