From cd81da30f7477b5653665608f4de5f4a4a0e1a14 Mon Sep 17 00:00:00 2001 From: David Cole Date: Fri, 2 Sep 2011 14:37:39 -0400 Subject: FindPackageMessage: Eliminate new lines using REGEX REPLACE Re-fix problem exposed by recent commit to FindPythonInterp. If the find "details" has new lines in it, then replace them with the empty string so that the string may be saved as a cache entry that can be re-read next time CMake runs. Use REGEX REPLACE, and replace with an empty string, eliminating the problem characters, so that we may easily extend this to include additional problem characters in the future if necessary. --- Modules/FindPackageMessage.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Modules/FindPackageMessage.cmake') diff --git a/Modules/FindPackageMessage.cmake b/Modules/FindPackageMessage.cmake index 5afee3e397..48d3472b5d 100644 --- a/Modules/FindPackageMessage.cmake +++ b/Modules/FindPackageMessage.cmake @@ -34,7 +34,7 @@ FUNCTION(FIND_PACKAGE_MESSAGE pkg msg details) # Avoid printing a message repeatedly for the same find result. IF(NOT ${pkg}_FIND_QUIETLY) - STRING(REPLACE "\n" "\\n" details "${details}") + STRING(REGEX REPLACE "[\n]" "" details "${details}") SET(DETAILS_VAR FIND_PACKAGE_MESSAGE_DETAILS_${pkg}) IF(NOT "${details}" STREQUAL "${${DETAILS_VAR}}") # The message has not yet been printed. -- cgit v1.2.1