Skip to content

Commit f970b9b

Browse files
committed
add option to remove extra newline
1 parent 0ab6971 commit f970b9b

File tree

4 files changed

+4
-0
lines changed

4 files changed

+4
-0
lines changed

Installation/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,7 @@ set(CGAL_INSTALL_LIB_DIR
593593

594594
if(CGAL_WIN32_CMAKE_ON_CYGWIN)
595595
execute_process(COMMAND cygpath -w ${CMAKE_INSTALL_PREFIX}
596+
OUTPUT_STRIP_TRAILING_WHITESPACE
596597
OUTPUT_VARIABLE CMAKE_INSTALL_PREFIX2)
597598
file(TO_CMAKE_PATH ${CMAKE_INSTALL_PREFIX2} CMAKE_INSTALL_PREFIX)
598599
endif()

Installation/cmake/modules/CGAL_Common.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ if( NOT CGAL_COMMON_FILE_INCLUDED )
2121
find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
2222
if(CMAKE_UNAME)
2323
execute_process(COMMAND uname -s
24+
OUTPUT_STRIP_TRAILING_WHITESPACE
2425
OUTPUT_VARIABLE CMAKE_SYSTEM_NAME2)
2526
if ( CMAKE_SYSTEM_NAME2 MATCHES "CYGWIN" )
2627
message( STATUS "This is the Windows CMake running within the cygwin platform." )

Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ if ( NOT CGAL_GENERATOR_SPECIFIC_SETTINGS_FILE_INCLUDED )
4040
# From james Bigler, in the cmake users list.
4141
IF (APPLE)
4242
execute_process(COMMAND uname -v
43+
OUTPUT_STRIP_TRAILING_WHITESPACE
4344
OUTPUT_VARIABLE DARWIN_VERSION)
4445
string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
4546
message(STATUS "Running in macOS DARWIN_VERSION=${DARWIN_VERSION}")

cmake_uninstall.cmake.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ foreach(file ${files})
1414
if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
1515
execute_process(
1616
COMMAND "@CMAKE_COMMAND@" -E remove "$ENV{DESTDIR}${file}"
17+
OUTPUT_STRIP_TRAILING_WHITESPACE
1718
OUTPUT_VARIABLE rm_out
1819
RESULT_VARIABLE rm_retval
1920
)

0 commit comments

Comments
 (0)