add option to remove extra newline

CGAL · Jan 5, 2024 · f970b9b · f970b9b
1 parent 0ab6971
commit f970b9b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt
@@ -593,6 +593,7 @@ set(CGAL_INSTALL_LIB_DIR
 
 if(CGAL_WIN32_CMAKE_ON_CYGWIN)
   execute_process(COMMAND cygpath -w ${CMAKE_INSTALL_PREFIX}
+                  OUTPUT_STRIP_TRAILING_WHITESPACE
                   OUTPUT_VARIABLE CMAKE_INSTALL_PREFIX2)
   file(TO_CMAKE_PATH ${CMAKE_INSTALL_PREFIX2} CMAKE_INSTALL_PREFIX)
 endif()

diff --git a/Installation/cmake/modules/CGAL_Common.cmake b/Installation/cmake/modules/CGAL_Common.cmake
@@ -21,6 +21,7 @@ if( NOT CGAL_COMMON_FILE_INCLUDED )
     find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
     if(CMAKE_UNAME)
       execute_process(COMMAND uname -s
+                      OUTPUT_STRIP_TRAILING_WHITESPACE
                       OUTPUT_VARIABLE CMAKE_SYSTEM_NAME2)
       if ( CMAKE_SYSTEM_NAME2 MATCHES "CYGWIN" )
         message( STATUS "This is the Windows CMake running within the cygwin platform." )

diff --git a/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake b/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
@@ -40,6 +40,7 @@ if ( NOT CGAL_GENERATOR_SPECIFIC_SETTINGS_FILE_INCLUDED )
   # From james Bigler, in the cmake users list.
   IF (APPLE)
     execute_process(COMMAND uname -v
+                    OUTPUT_STRIP_TRAILING_WHITESPACE
                     OUTPUT_VARIABLE DARWIN_VERSION)
     string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
     message(STATUS "Running in macOS DARWIN_VERSION=${DARWIN_VERSION}")

diff --git a/cmake_uninstall.cmake.in b/cmake_uninstall.cmake.in
@@ -14,6 +14,7 @@ foreach(file ${files})
   if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
     execute_process(
       COMMAND "@CMAKE_COMMAND@" -E remove "$ENV{DESTDIR}${file}"
+      OUTPUT_STRIP_TRAILING_WHITESPACE
       OUTPUT_VARIABLE rm_out
       RESULT_VARIABLE rm_retval
       )