diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2025-08-20 18:04:52 +0300 |
|---|---|---|
| committer | Alexander Golubev <fatzer2@gmail.com> | 2025-08-21 14:38:18 +0300 |
| commit | 0292a9a6ecfd383940d96750e230b30e0ce103be (patch) | |
| tree | 7a310c5af43473f8c7fa8de4ce3c82c3b0ffcda4 | |
| parent | 57e05c82d51ccf1211848854c66361bb9f097526 (diff) | |
| download | tdesvn-0292a9a6.tar.gz tdesvn-0292a9a6.zip | |
cmake: replace deprecated exec_program() with execute_process()
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
(cherry picked from commit 7c84800c4a5f8ad488d78c05cdd42d22eb31d37c)
| -rw-r--r-- | ConfigureChecks.cmake | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index a6589c6..c26a7a4 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -131,24 +131,30 @@ if (UNIX) message(SEND_ERROR "Error: no apu-config found") endif(NOT APU_CONFIG) - exec_program(${APR_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR_INT) + execute_process(COMMAND ${APR_CONFIG} --includedir OUTPUT_VARIABLE APR_INCLUDE_DIR_INT) + string(STRIP "${APR_INCLUDE_DIR_INT}" APR_INCLUDE_DIR_INT) pkg_search_module( APR apr-1 ) if( NOT APR_FOUND ) tde_message_fatal( "apr-1 is required, but was not found on your system" ) endif( ) - exec_program(${APU_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR_INT) + execute_process(COMMAND ${APU_CONFIG} --includedir OUTPUT_VARIABLE APU_INCLUDE_DIR_INT) + string(STRIP "${APU_INCLUDE_DIR_INT}" APU_INCLUDE_DIR_INT) set(APR_INCLUDE_DIR "${APR_INCLUDE_DIR_INT}" CACHE INTERNAL "") set(APU_INCLUDE_DIR "${APU_INCLUDE_DIR_INT}" CACHE INTERNAL "") - exec_program(${APR_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APR_CPP_FLAGS_INT) - exec_program(${APU_CONFIG} ARGS "--includes" OUTPUT_VARIABLE APU_CPP_FLAGS_INT) + execute_process(COMMAND ${APR_CONFIG} --cppflags OUTPUT_VARIABLE APR_CPP_FLAGS_INT) + execute_process(COMMAND ${APU_CONFIG} --includes OUTPUT_VARIABLE APU_CPP_FLAGS_INT) + string(STRIP "${APR_CPP_FLAGS_INT}" APR_CPP_FLAGS_INT) + string(STRIP "${APU_CPP_FLAGS_INT}" APU_CPP_FLAGS_INT) set(APR_CPP_FLAGS "${APR_CPP_FLAGS_INT}" CACHE INTERNAL "") set(APU_CPP_FLAGS "${APU_CPP_FLAGS_INT}" CACHE INTERNAL "") - exec_program(${APR_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APR_EXTRA_LIBFLAGS_INT) - exec_program(${APU_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APU_EXTRA_LIBFLAGS_INT) + execute_process(COMMAND ${APR_CONFIG} --ldflags --libs --link-ld OUTPUT_VARIABLE APR_EXTRA_LIBFLAGS_INT) + execute_process(COMMAND ${APU_CONFIG} --ldflags --libs --link-ld OUTPUT_VARIABLE APU_EXTRA_LIBFLAGS_INT) + string(STRIP "${APR_EXTRA_LIBFLAGS_INT}" APR_EXTRA_LIBFLAGS_INT) + string(STRIP "${APU_EXTRA_LIBFLAGS_INT}" APU_EXTRA_LIBFLAGS_INT) set(APR_EXTRA_LIBFLAGS "${APR_EXTRA_LIBFLAGS_INT}" CACHE INTERNAL "") set(APU_EXTRA_LIBFLAGS "${APU_EXTRA_LIBFLAGS_INT}" CACHE INTERNAL "") |