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

Merge pull request #7963 from sloriot/CGAL-cmake_remove_exec_command 

Use execute_process that is recommanded over exec_command since 3.0
This commit is contained in:
Laurent Rineau 2024-01-11 12:45:38 +01:00
parent 6df7424612 f970b9bba4
commit 41258bf760
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Installation/CMakeLists.txt
View File

@ -592,9 +592,8 @@ set(CGAL_INSTALL_LIB_DIR
) )
if(CGAL_WIN32_CMAKE_ON_CYGWIN) if(CGAL_WIN32_CMAKE_ON_CYGWIN)
exec_program( execute_process(COMMAND cygpath -w ${CMAKE_INSTALL_PREFIX}
cygpath ARGS OUTPUT_STRIP_TRAILING_WHITESPACE
-w "${CMAKE_INSTALL_PREFIX}"
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()

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

@ -20,7 +20,9 @@ if( NOT CGAL_COMMON_FILE_INCLUDED )
if ( WIN32 ) if ( WIN32 )
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)
exec_program(uname ARGS -s OUTPUT_VARIABLE CMAKE_SYSTEM_NAME2) execute_process(COMMAND uname -s
OUTPUT_STRIP_TRAILING_WHITESPACE
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." )
set( CGAL_WIN32_CMAKE_ON_CYGWIN TRUE CACHE INTERNAL "This is the cygwin platform." ) set( CGAL_WIN32_CMAKE_ON_CYGWIN TRUE CACHE INTERNAL "This is the cygwin platform." )

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

@ -39,7 +39,9 @@ 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)
exec_program(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION) execute_process(COMMAND uname -v
OUTPUT_STRIP_TRAILING_WHITESPACE
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}")
endif() endif()

7
cmake_uninstall.cmake.in
View File

@ -12,10 +12,11 @@ string(REGEX REPLACE "\n" ";" files "${files}")
foreach(file ${files}) foreach(file ${files})
message(STATUS "Uninstalling $ENV{DESTDIR}${file}") message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
exec_program( execute_process(
"@CMAKE_COMMAND@" ARGS "-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
RETURN_VALUE rm_retval RESULT_VARIABLE rm_retval
) )
if(NOT "${rm_retval}" STREQUAL 0) if(NOT "${rm_retval}" STREQUAL 0)
message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}") message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")