songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add quotes in execute_process if the command name is a variable.

This commit is contained in:
Laurent Rineau 2011-04-27 21:16:42 +00:00
parent 4edaa583e4
commit d827ed8d74
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Installation/CMakeLists.txt
View File

@ -128,7 +128,7 @@ if ( CGAL_BRANCH_BUILD )
MACRO(Subversion_GET_REVISION dir variable) MACRO(Subversion_GET_REVISION dir variable)
# use svnversion # use svnversion
EXECUTE_PROCESS(COMMAND ${SVN_EXECUTABLE} info --xml ${dir} EXECUTE_PROCESS(COMMAND "${SVN_EXECUTABLE}" info --xml "${dir}"
OUTPUT_VARIABLE ${variable} OUTPUT_VARIABLE ${variable}
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
STRING(REGEX REPLACE "^(.*\n)? revision=\"([^\n]+)\".*url.*" "\\2" ${variable} "${${variable}}") STRING(REGEX REPLACE "^(.*\n)? revision=\"([^\n]+)\".*url.*" "\\2" ${variable} "${${variable}}")

4
Installation/cmake/modules/CGAL_Macros.cmake
View File

@ -109,14 +109,14 @@ if( NOT CGAL_MACROS_FILE_INCLUDED )
message("Compiler version:") message("Compiler version:")
set(version "Unknown compiler. Cannot display its version") set(version "Unknown compiler. Cannot display its version")
foreach(flag "-V" "--version" "-v") foreach(flag "-V" "--version" "-v")
execute_process(COMMAND ${CMAKE_CXX_COMPILER} ${flag} execute_process(COMMAND "${CMAKE_CXX_COMPILER}" ${flag}
RESULT_VARIABLE ok RESULT_VARIABLE ok
OUTPUT_VARIABLE out_version OUTPUT_VARIABLE out_version
ERROR_VARIABLE out_version ERROR_VARIABLE out_version
TIMEOUT 5) TIMEOUT 5)
if(ok EQUAL 0) if(ok EQUAL 0)
if("${out_version}" MATCHES "^clang") if("${out_version}" MATCHES "^clang")
execute_process(COMMAND ${CMAKE_CXX_COMPILER} -print-search-dirs execute_process(COMMAND "${CMAKE_CXX_COMPILER}" -print-search-dirs
RESULT_VARIABLE ok RESULT_VARIABLE ok
OUTPUT_VARIABLE out_search_dirs OUTPUT_VARIABLE out_search_dirs
TIMEOUT 5) TIMEOUT 5)