diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 1e912131c12..fa2102ff7c0 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -592,10 +592,9 @@ set(CGAL_INSTALL_LIB_DIR ) if(CGAL_WIN32_CMAKE_ON_CYGWIN) - exec_program( - cygpath ARGS - -w "${CMAKE_INSTALL_PREFIX}" - OUTPUT_VARIABLE CMAKE_INSTALL_PREFIX2) + 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 index ce99da6489e..df6446c92ae 100644 --- a/Installation/cmake/modules/CGAL_Common.cmake +++ b/Installation/cmake/modules/CGAL_Common.cmake @@ -20,7 +20,9 @@ if( NOT CGAL_COMMON_FILE_INCLUDED ) if ( WIN32 ) find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin ) 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" ) 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." ) diff --git a/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake b/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake index 70dc4de3e56..3b62159e5e0 100644 --- a/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake +++ b/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake @@ -39,7 +39,9 @@ if ( NOT CGAL_GENERATOR_SPECIFIC_SETTINGS_FILE_INCLUDED ) # From james Bigler, in the cmake users list. 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}) message(STATUS "Running in macOS DARWIN_VERSION=${DARWIN_VERSION}") endif() diff --git a/cmake_uninstall.cmake.in b/cmake_uninstall.cmake.in index d00a5166581..62bd37f80fd 100644 --- a/cmake_uninstall.cmake.in +++ b/cmake_uninstall.cmake.in @@ -12,10 +12,11 @@ string(REGEX REPLACE "\n" ";" files "${files}") foreach(file ${files}) message(STATUS "Uninstalling $ENV{DESTDIR}${file}") if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") - exec_program( - "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" + execute_process( + COMMAND "@CMAKE_COMMAND@" -E remove "$ENV{DESTDIR}${file}" + OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE rm_out - RETURN_VALUE rm_retval + RESULT_VARIABLE rm_retval ) if(NOT "${rm_retval}" STREQUAL 0) message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")