Compare commits

...

3 commits

Author SHA1 Message Date
melon 3a60c83091
Merge 39546b3deb into cf107a81a1 2024-09-05 14:18:28 +08:00
BlaiZephyr 39546b3deb attempt 2 - sanitize output 2024-02-16 14:57:34 +01:00
melon dc85b2d73e fix cmake error when building with -DMYSQL=ON 2024-01-31 01:07:47 +01:00

View file

@ -4,18 +4,20 @@ if(NOT CMAKE_CROSSCOMPILING)
) )
if(MYSQL_CONFIG) if(MYSQL_CONFIG)
exec_program(${MYSQL_CONFIG} execute_process(COMMAND ${MYSQL_CONFIG}
ARGS --include ARGS --include
OUTPUT_VARIABLE MY_TMP OUTPUT_VARIABLE MY_TMP
OUTPUT_STRIP_TRAILING_WHITESPACE
) )
string(REGEX REPLACE "-I([^ ]*)( .*)?" "\\1" MY_TMP "${MY_TMP}") string(REGEX REPLACE "-I([^ ]*)( .*)?" "\\1" MY_TMP "${MY_TMP}")
set(MYSQL_CONFIG_INCLUDE_DIR ${MY_TMP} CACHE FILEPATH INTERNAL) set(MYSQL_CONFIG_INCLUDE_DIR ${MY_TMP} CACHE FILEPATH INTERNAL)
exec_program(${MYSQL_CONFIG} execute_process(COMMAND ${MYSQL_CONFIG}
ARGS --libs_r ARGS --libs_r
OUTPUT_VARIABLE MY_TMP OUTPUT_VARIABLE MY_TMP
OUTPUT_STRIP_TRAILING_WHITESPACE
) )
set(MYSQL_CONFIG_LIBRARIES "") set(MYSQL_CONFIG_LIBRARIES "")