Skip to content

Commit cffaaed

Browse files
pikacicbernhardmgruber
authored andcommitted
Replace uses of exec_program with execute_process
As of CMake 3.28, uses of exec_program produce a deprecation warning suggesting to replace it with execute_process. See https://cmake.org/cmake/help/latest/policy/CMP0153.html
1 parent 1e911d4 commit cffaaed

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

cmake/OptimizeForArchitecture.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ macro(AutodetectHostArchitecture)
7070
string(REGEX REPLACE ".*model[ \t]*:[ \t]+([a-zA-Z0-9_-]+).*" "\\1" _cpu_model "${_cpuinfo}")
7171
string(REGEX REPLACE ".*flags[ \t]*:[ \t]+([^\n]+).*" "\\1" _cpu_flags "${_cpuinfo}")
7272
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
73-
exec_program("/usr/sbin/sysctl -n machdep.cpu.vendor machdep.cpu.model machdep.cpu.family machdep.cpu.features" OUTPUT_VARIABLE _sysctl_output_string)
73+
execute_process(COMMAND /usr/sbin/sysctl -n machdep.cpu.vendor machdep.cpu.model machdep.cpu.family machdep.cpu.features OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE _sysctl_output_string)
7474
string(REPLACE "\n" ";" _sysctl_output ${_sysctl_output_string})
7575
list(GET _sysctl_output 0 _vendor_id)
7676
list(GET _sysctl_output 1 _cpu_model)

cmake/VcMacros.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ macro(vc_determine_compiler)
4949
set(Vc_COMPILER_IS_GCC false)
5050
if(CMAKE_CXX_COMPILER MATCHES "/(icpc|icc)$")
5151
set(Vc_COMPILER_IS_INTEL true)
52-
exec_program(${CMAKE_CXX_COMPILER} ARGS -dumpversion OUTPUT_VARIABLE Vc_ICC_VERSION)
52+
execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE Vc_ICC_VERSION)
5353
message(STATUS "Detected Compiler: Intel ${Vc_ICC_VERSION}")
5454

5555
# break build with too old ICC as early as possible.
@@ -61,7 +61,7 @@ macro(vc_determine_compiler)
6161
message(STATUS "Detected Compiler: Open64")
6262
elseif(CMAKE_CXX_COMPILER MATCHES "clang\\+\\+$" OR "${_cxx_compiler_version}" MATCHES "clang")
6363
set(Vc_COMPILER_IS_CLANG true)
64-
exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE Vc_CLANG_VERSION)
64+
execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE Vc_CLANG_VERSION)
6565
string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" Vc_CLANG_VERSION "${Vc_CLANG_VERSION}")
6666
message(STATUS "Detected Compiler: Clang ${Vc_CLANG_VERSION}")
6767

@@ -74,13 +74,13 @@ macro(vc_determine_compiler)
7474
message(STATUS "Detected Compiler: MSVC ${MSVC_VERSION}")
7575
elseif(CMAKE_COMPILER_IS_GNUCXX)
7676
set(Vc_COMPILER_IS_GCC true)
77-
exec_program(${CMAKE_CXX_COMPILER} ARGS -dumpversion OUTPUT_VARIABLE Vc_GCC_VERSION)
77+
execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE Vc_GCC_VERSION)
7878
message(STATUS "Detected Compiler: GCC ${Vc_GCC_VERSION}")
7979

8080
# some distributions patch their GCC to return nothing or only major and minor version on -dumpversion.
8181
# In that case we must extract the version number from --version.
8282
if(NOT Vc_GCC_VERSION OR Vc_GCC_VERSION MATCHES "^[0-9]\\.[0-9]+$")
83-
exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE Vc_GCC_VERSION)
83+
execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE Vc_GCC_VERSION)
8484
string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" Vc_GCC_VERSION "${Vc_GCC_VERSION}")
8585
message(STATUS "GCC Version from --version: ${Vc_GCC_VERSION}")
8686
endif()
@@ -144,12 +144,12 @@ macro(vc_add_compiler_flag VAR _flag)
144144
endmacro()
145145

146146
macro(vc_check_assembler)
147-
exec_program(${CMAKE_CXX_COMPILER} ARGS -print-prog-name=as OUTPUT_VARIABLE _as)
147+
execute_process(COMMAND ${CMAKE_CXX_COMPILER} -print-prog-name=as OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE _as)
148148
mark_as_advanced(_as)
149149
if(NOT _as)
150150
message(WARNING "Could not find 'as', the assembler used by GCC. Hoping everything will work out...")
151151
else()
152-
exec_program(${_as} ARGS --version OUTPUT_VARIABLE _as_version)
152+
execute_process(COMMAND ${_as} --version OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE _as_version)
153153
string(REGEX REPLACE "\\([^\\)]*\\)" "" _as_version "${_as_version}")
154154
string(REGEX MATCH "[1-9]\\.[0-9]+(\\.[0-9]+)?" _as_version "${_as_version}")
155155
if(_as_version VERSION_LESS "2.18.93")

0 commit comments

Comments
 (0)