diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-03-22 10:45:55 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-03-22 11:34:18 +0100 |
| commit | 8423c5306be948b11c7c70dc2154ef55baa91914 (patch) | |
| tree | c89367c34bcfc8a0abb9e3a5694737411460ae35 | |
| parent | 81b5e7dd68e0201a00be2c9eee714b37d456dcc4 (diff) | |
| download | mariadb-git-b-10.6-wlad.tar.gz | |
Use standard CMake conventions in Find{PMEM,URING}.cmakeb-10.6-wlad
Drop the LIB from LIB{PMEM,URING}_{INCLUDE_DIR,LIBRARIES}
It is cleaner, and consistent with how other packages are handled in CMake.
e.g successful FIND_PACKAGE(PMEM) now sets PMEM_FOUND, PMEM_LIBRARIES,
PMEM_INCLUDE_DIR, not LIBPMEM_{FOUND,LIBRARIES,INCLUDE_DIR}.
| -rw-r--r-- | cmake/FindPMEM.cmake | 8 | ||||
| -rw-r--r-- | cmake/FindURING.cmake | 8 | ||||
| -rw-r--r-- | storage/innobase/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tpool/CMakeLists.txt | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/cmake/FindPMEM.cmake b/cmake/FindPMEM.cmake index d5f0c24364a..7e3fafae560 100644 --- a/cmake/FindPMEM.cmake +++ b/cmake/FindPMEM.cmake @@ -1,9 +1,9 @@ -find_path(LIBPMEM_INCLUDE_DIR NAMES libpmem.h) -find_library(LIBPMEM_LIBRARIES NAMES pmem) +find_path(PMEM_INCLUDE_DIR NAMES libpmem.h) +find_library(PMEM_LIBRARIES NAMES pmem) include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS( PMEM DEFAULT_MSG - LIBPMEM_LIBRARIES LIBPMEM_INCLUDE_DIR) + PMEM_LIBRARIES PMEM_INCLUDE_DIR) -mark_as_advanced(LIBPMEM_INCLUDE_DIR LIBPMEM_LIBRARIES) +mark_as_advanced(PMEM_INCLUDE_DIR PMEM_LIBRARIES) diff --git a/cmake/FindURING.cmake b/cmake/FindURING.cmake index 014e9c31478..6e5e0783b46 100644 --- a/cmake/FindURING.cmake +++ b/cmake/FindURING.cmake @@ -1,9 +1,9 @@ -find_path(LIBURING_INCLUDE_DIR NAMES liburing.h) -find_library(LIBURING_LIBRARIES NAMES uring) +find_path(URING_INCLUDE_DIR NAMES liburing.h) +find_library(URING_LIBRARIES NAMES uring) include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS( URING DEFAULT_MSG - LIBURING_LIBRARIES LIBURING_INCLUDE_DIR) + URING_LIBRARIES URING_INCLUDE_DIR) -mark_as_advanced(LIBURING_INCLUDE_DIR LIBURING_LIBRARIES) +mark_as_advanced(URING_INCLUDE_DIR URING_LIBRARIES) diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt index 9f60b53a042..5b9dc112c8f 100644 --- a/storage/innobase/CMakeLists.txt +++ b/storage/innobase/CMakeLists.txt @@ -339,9 +339,9 @@ SET(INNOBASE_SOURCES OPTION(WITH_PMEM "Support redo log in persistent memory" OFF) FIND_PACKAGE(PMEM) IF(PMEM_FOUND) - INCLUDE_DIRECTORIES(${LIBPMEM_INCLUDES}) + INCLUDE_DIRECTORIES(${PMEM_INCLUDES}) ADD_COMPILE_FLAGS(log/log0log.cc COMPILE_FLAGS "-DHAVE_PMEM") - SET(PMEM_LIBRARY ${LIBPMEM_LIBRARIES}) + SET(PMEM_LIBRARY ${PMEM_LIBRARIES}) ELSE() IF(WITH_PMEM) MESSAGE(FATAL_ERROR "WITH_PMEM=ON cannot be satisfied") diff --git a/tpool/CMakeLists.txt b/tpool/CMakeLists.txt index 213cef7b5de..ef0c1942c7e 100644 --- a/tpool/CMakeLists.txt +++ b/tpool/CMakeLists.txt @@ -8,8 +8,8 @@ ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux") SET(URING_FOUND ${URING_FOUND} PARENT_SCOPE) SET(TPOOL_DEFINES "-DHAVE_URING" PARENT_SCOPE) ADD_DEFINITIONS(-DHAVE_URING) - LINK_LIBRARIES(${LIBURING_LIBRARIES}) - INCLUDE_DIRECTORIES(${LIBURING_INCLUDE_DIR}) + LINK_LIBRARIES(${URING_LIBRARIES}) + INCLUDE_DIRECTORIES(${URING_INCLUDE_DIR}) SET(EXTRA_SOURCES aio_liburing.cc) ELSE() IF(WITH_URING) |