Build: Replaced deprecated exec_program with execute_process

(cherry picked from commit 8eac6224c0)
This commit is contained in:
Shauren
2024-03-01 11:36:10 +01:00
parent 53f0579cca
commit 9cfd55e931
2 changed files with 8 additions and 4 deletions

View File

@@ -28,6 +28,10 @@ if(POLICY CMP0144)
cmake_policy(SET CMP0144 NEW) # find_package() uses upper-case <PACKAGENAME>_ROOT variables
endif()
if(POLICY CMP0153)
cmake_policy(SET CMP0153 NEW) # The exec_program() command should not be called
endif()
# Set RPATH-handing (CMake parameters)
set(CMAKE_SKIP_BUILD_RPATH 0)
set(CMAKE_BUILD_WITH_INSTALL_RPATH 0)

View File

@@ -69,8 +69,8 @@ if(UNIX)
if(MYSQL_CONFIG)
message(STATUS "Using mysql-config: ${MYSQL_CONFIG}")
# set INCLUDE_DIR
exec_program(${MYSQL_CONFIG}
ARGS --include
execute_process(
COMMAND "${MYSQL_CONFIG}" --include
OUTPUT_VARIABLE MY_TMP
)
@@ -78,8 +78,8 @@ if(UNIX)
set(MYSQL_ADD_INCLUDE_PATH ${MY_TMP} CACHE FILEPATH INTERNAL)
#message("[DEBUG] MYSQL ADD_INCLUDE_PATH : ${MYSQL_ADD_INCLUDE_PATH}")
# set LIBRARY_DIR
exec_program(${MYSQL_CONFIG}
ARGS --libs_r
execute_process(
COMMAND "${MYSQL_CONFIG}" --libs_r
OUTPUT_VARIABLE MY_TMP
)
set(MYSQL_ADD_LIBRARIES "")