diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-06-28 16:31:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-07-01 09:21:23 +0200 |
| commit | 6d3747a294d75ab8153f82c5b2d61c3bf17b04de (patch) | |
| tree | dbdc624ee7b0ef0e131f273e6d9d1629ce10a85b /cmake | |
| parent | 2ed415765aca144ea0177633cb5ac56a0c65be44 (diff) | |
| download | mariadb-git-6d3747a294d75ab8153f82c5b2d61c3bf17b04de.tar.gz | |
make rocksdb cmake checks less verbose on repeat
* fix FindLZ4 to follow convention (LIBRARIES, not LIBRARY)
* remove redundant checks from rocksdb/CMakeLists.txt
* put all checks through the same macro that uniformly
checks for a package, prints the message, adds definition
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindLZ4.cmake | 6 | ||||
| -rw-r--r-- | cmake/FindZSTD.cmake | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/cmake/FindLZ4.cmake b/cmake/FindLZ4.cmake index e97dd63e2b0..46c1fdc1b9f 100644 --- a/cmake/FindLZ4.cmake +++ b/cmake/FindLZ4.cmake @@ -1,9 +1,9 @@ find_path(LZ4_INCLUDE_DIR NAMES lz4.h) -find_library(LZ4_LIBRARY NAMES lz4) +find_library(LZ4_LIBRARIES NAMES lz4) include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS( LZ4 DEFAULT_MSG - LZ4_LIBRARY LZ4_INCLUDE_DIR) + LZ4_LIBRARIES LZ4_INCLUDE_DIR) -mark_as_advanced(LZ4_INCLUDE_DIR LZ4_LIBRARY) +mark_as_advanced(LZ4_INCLUDE_DIR LZ4_LIBRARIES) diff --git a/cmake/FindZSTD.cmake b/cmake/FindZSTD.cmake index 8cd4c248145..ede59010742 100644 --- a/cmake/FindZSTD.cmake +++ b/cmake/FindZSTD.cmake @@ -5,10 +5,6 @@ # ZSTD_LIBRARIES - List of libraries when using zstd. # ZSTD_FOUND - True if zstd found. -if (DEFINED ZSTD_LIBRARIES) - return() -endif() - find_path(ZSTD_INCLUDE_DIR NAMES zstd.h HINTS ${ZSTD_ROOT_DIR}/include) @@ -18,7 +14,7 @@ find_library(ZSTD_LIBRARIES HINTS ${ZSTD_ROOT_DIR}/lib) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(zstd DEFAULT_MSG ZSTD_LIBRARIES ZSTD_INCLUDE_DIR) +find_package_handle_standard_args(ZSTD DEFAULT_MSG ZSTD_LIBRARIES ZSTD_INCLUDE_DIR) mark_as_advanced( ZSTD_LIBRARIES |