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

add option to remove extra newline

This commit is contained in:
Sébastien Loriot 2024-01-05 14:08:32 +01:00
parent 0ab6971ede
commit f970b9bba4
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Installation/CMakeLists.txt
View File

@ -593,6 +593,7 @@ set(CGAL_INSTALL_LIB_DIR
if(CGAL_WIN32_CMAKE_ON_CYGWIN) if(CGAL_WIN32_CMAKE_ON_CYGWIN)
execute_process(COMMAND cygpath -w ${CMAKE_INSTALL_PREFIX} execute_process(COMMAND cygpath -w ${CMAKE_INSTALL_PREFIX}
OUTPUT_STRIP_TRAILING_WHITESPACE
OUTPUT_VARIABLE CMAKE_INSTALL_PREFIX2) OUTPUT_VARIABLE CMAKE_INSTALL_PREFIX2)
file(TO_CMAKE_PATH ${CMAKE_INSTALL_PREFIX2} CMAKE_INSTALL_PREFIX) file(TO_CMAKE_PATH ${CMAKE_INSTALL_PREFIX2} CMAKE_INSTALL_PREFIX)
endif() endif()

1
Installation/cmake/modules/CGAL_Common.cmake
View File

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

1
Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
View File

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

1
cmake_uninstall.cmake.in
View File

@ -14,6 +14,7 @@ foreach(file ${files})
if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
execute_process( execute_process(
COMMAND "@CMAKE_COMMAND@" -E remove "$ENV{DESTDIR}${file}" COMMAND "@CMAKE_COMMAND@" -E remove "$ENV{DESTDIR}${file}"
OUTPUT_STRIP_TRAILING_WHITESPACE
OUTPUT_VARIABLE rm_out OUTPUT_VARIABLE rm_out
RESULT_VARIABLE rm_retval RESULT_VARIABLE rm_retval
) )