[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.11 1.12 SeparateArgumentsTest.cmake.in NONE 1.1

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Jul 14 10:15:51 EDT 2009


Update of /cvsroot/CMake/CMake/Tests/CMakeTests
In directory public:/mounts/ram/cvs-serv10164/Tests/CMakeTests

Modified Files:
	CMakeLists.txt 
Added Files:
	SeparateArgumentsTest.cmake.in 
Log Message:
ENH: Teach separate_arguments() to parse commands

This adds UNIX_COMMAND and WINDOWS_COMMAND modes to the command.
These modes parse unix- and windows-style command lines.


--- NEW FILE: SeparateArgumentsTest.cmake.in ---
set(old_out "a b  c")
separate_arguments(old_out)
set(old_exp "a;b;;c")

set(unix_cmd "a \"b c\" 'd e' \";\" \\ \\'\\\" '\\'' \"\\\"\"")
set(unix_exp "a;b c;d e;\;; '\";';\"")
separate_arguments(unix_out UNIX_COMMAND "${unix_cmd}")

set(windows_cmd "a \"b c\" 'd e' \";\" \\ \"c:\\windows\\path\\\\\" \\\"")
set(windows_exp "a;b c;'d;e';\;;\\;c:\\windows\\path\\;\"")
separate_arguments(windows_out WINDOWS_COMMAND "${windows_cmd}")

foreach(mode old unix windows)
  if(NOT "${${mode}_out}" STREQUAL "${${mode}_exp}")
    message(FATAL_ERROR "separate_arguments ${mode}-style failed.  "
      "Expected\n  [${${mode}_exp}]\nbut got\n  [${${mode}_out}]\n")
  endif()
endforeach()

set(nothing)
separate_arguments(nothing)
if(DEFINED nothing)
  message(FATAL_ERROR "separate_arguments null-case failed: "
    "nothing=[${nothing}]")
endif()

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeTests/CMakeLists.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** CMakeLists.txt	29 Apr 2009 17:13:51 -0000	1.11
--- CMakeLists.txt	14 Jul 2009 14:15:45 -0000	1.12
***************
*** 19,22 ****
--- 19,23 ----
  AddCMakeTest(Message "")
  AddCMakeTest(File "")
+ AddCMakeTest(SeparateArguments "")
  
  SET(GetPrerequisites_PreArgs



More information about the Cmake-commits mailing list