diff -Naur mariadb-10.6.8/tpool/CMakeLists.txt mariadb-10.6.8-2/tpool/CMakeLists.txt --- mariadb-10.6.8/tpool/CMakeLists.txt 2022-05-18 08:34:16.000000000 +0000 +++ mariadb-10.6.8-2/tpool/CMakeLists.txt 2022-10-09 00:23:09.816739816 +0000 @@ -5,11 +5,10 @@ OPTION(WITH_URING "Require that io_uring be used" OFF) OPTION(WITH_LIBAIO "Require that libaio is used, unless uring is there" OFF) IF(WITH_URING) - SET(URING_REQUIRED REQUIRED) + FIND_PACKAGE(URING) ELSEIF(WITH_LIBAIO) - SET(LIBAIO_REQIRED REQUIRED) + FIND_PACKAGE(LIBAIO) ENDIF() - FIND_PACKAGE(URING QUIET ${URING_REQUIRED}) IF(URING_FOUND) SET(URING_FOUND ${URING_FOUND} PARENT_SCOPE) SET(TPOOL_DEFINES "-DHAVE_URING" PARENT_SCOPE) @@ -27,15 +26,12 @@ IF(HAVE_IO_URING_MLOCK_SIZE) SET_SOURCE_FILES_PROPERTIES(aio_liburing.cc PROPERTIES COMPILE_FLAGS "-DHAVE_IO_URING_MLOCK_SIZE") ENDIF() - ELSE() - FIND_PACKAGE(LIBAIO QUIET ${LIBAIO_REQUIRED}) - IF(LIBAIO_FOUND) - SET(TPOOL_DEFINES "-DLINUX_NATIVE_AIO" PARENT_SCOPE) - ADD_DEFINITIONS(-DLINUX_NATIVE_AIO) - INCLUDE_DIRECTORIES(${LIBAIO_INCLUDE_DIR}) - LINK_LIBRARIES(${LIBAIO_LIBRARIES}) - SET(EXTRA_SOURCES aio_linux.cc) - ENDIF() + ELSEIF(LIBAIO_FOUND) + SET(TPOOL_DEFINES "-DLINUX_NATIVE_AIO" PARENT_SCOPE) + ADD_DEFINITIONS(-DLINUX_NATIVE_AIO) + INCLUDE_DIRECTORIES(${LIBAIO_INCLUDE_DIR}) + LINK_LIBRARIES(${LIBAIO_LIBRARIES}) + SET(EXTRA_SOURCES aio_linux.cc) ENDIF() ENDIF()