From b294fac6276e80ff6b8cfcbc90b761a3ffe09c60 Mon Sep 17 00:00:00 2001 From: Axel Isouard Date: Sun, 19 Mar 2017 08:29:30 +0100 Subject: [PATCH] Remove unused PREFIX_NEWLINE variable --- CMakeModules/Environment.cmake | 46 ++++++++++++++++------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/CMakeModules/Environment.cmake b/CMakeModules/Environment.cmake index a665f31..069d4f8 100644 --- a/CMakeModules/Environment.cmake +++ b/CMakeModules/Environment.cmake @@ -21,28 +21,26 @@ get_filename_component(_CHROMIUM_PYTHONPATH "${CMAKE_SOURCE_DIR}/build" REALPATH) -if (WIN32) - set(PREFIX_FILENAME ${CMAKE_BINARY_DIR}/prefix.bat) - set(PREFIX_COMMAND set) - set(PREFIX_HEADER "@ECHO OFF") - set(PREFIX_EVAL "%*") - set(PREFIX_EXECUTE cmd /c ${PREFIX_FILENAME}) - set(PREFIX_NEWLINE \r\n) -else (WIN32) - set(PREFIX_FILENAME ${CMAKE_BINARY_DIR}/prefix.sh) - set(PREFIX_COMMAND export) - set(PREFIX_HEADER "") - set(PREFIX_EVAL eval\ $@) - set(PREFIX_EXECUTE /bin/sh ${PREFIX_FILENAME}) - set(PREFIX_NEWLINE \n) -endif (WIN32) - -file(WRITE ${PREFIX_FILENAME} "${PREFIX_HEADER} -${PREFIX_COMMAND} PATH=${_WEBRTC_PATH} -${PREFIX_COMMAND} PYTHONPATH=${_CHROMIUM_PYTHONPATH} -${PREFIX_COMMAND} DEPOT_TOOLS_WIN_TOOLCHAIN=0 -${PREFIX_COMMAND} DEPOT_TOOLS_UPDATE=0 -${PREFIX_COMMAND} CHROME_HEADLESS=1 -${PREFIX_EVAL} -") +if (WIN32) + set(PREFIX_FILENAME ${CMAKE_BINARY_DIR}/prefix.bat) + set(PREFIX_COMMAND set) + set(PREFIX_HEADER "@ECHO OFF") + set(PREFIX_EVAL "%*") + set(PREFIX_EXECUTE cmd /c ${PREFIX_FILENAME}) +else (WIN32) + set(PREFIX_FILENAME ${CMAKE_BINARY_DIR}/prefix.sh) + set(PREFIX_COMMAND export) + set(PREFIX_HEADER "") + set(PREFIX_EVAL eval\ $@) + set(PREFIX_EXECUTE /bin/sh ${PREFIX_FILENAME}) +endif (WIN32) + +file(WRITE ${PREFIX_FILENAME} "${PREFIX_HEADER} +${PREFIX_COMMAND} PATH=${_WEBRTC_PATH} +${PREFIX_COMMAND} PYTHONPATH=${_CHROMIUM_PYTHONPATH} +${PREFIX_COMMAND} DEPOT_TOOLS_WIN_TOOLCHAIN=0 +${PREFIX_COMMAND} DEPOT_TOOLS_UPDATE=0 +${PREFIX_COMMAND} CHROME_HEADLESS=1 +${PREFIX_EVAL} +")