Skip to content

Fix CMake modules for finding external libraries #2240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix CMake modules for finding external libraries #2240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cmake_modules/FindGTest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ file (TO_CMAKE_PATH "${GTEST_HOME}" _gtest_path )

find_path (GTEST_INCLUDE_DIR gmock/gmock.h HINTS
${_gtest_path}
NO_DEFAULT_PATH
PATH_SUFFIXES "include")

find_library (GMOCK_LIBRARY NAMES gmock HINTS
Expand Down
3 changes: 1 addition & 2 deletions cmake_modules/FindLZ4.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,13 @@ message (STATUS "LZ4_HOME: ${LZ4_HOME}")

find_path (LZ4_INCLUDE_DIR lz4.h HINTS
${_lz4_path}
NO_DEFAULT_PATH
PATH_SUFFIXES "include")

find_library (LZ4_LIBRARY NAMES lz4 liblz4 HINTS
${_lz4_path}
PATH_SUFFIXES "lib" "lib64")

find_library (LZ4_STATIC_LIB NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}${LZ4_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX} HINTS
find_library (LZ4_STATIC_LIB NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}lz4${CMAKE_STATIC_LIBRARY_SUFFIX} HINTS
${_lz4_path}
PATH_SUFFIXES "lib" "lib64")

Expand Down
3 changes: 0 additions & 3 deletions cmake_modules/FindProtobuf.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,10 @@ if (Protobuf_FOUND)
else()
find_path (PROTOBUF_INCLUDE_DIR google/protobuf/io/zero_copy_stream.h HINTS
${_protobuf_path}
NO_DEFAULT_PATH
PATH_SUFFIXES "include")

find_path (PROTOBUF_INCLUDE_DIR google/protobuf/io/coded_stream.h HINTS
${_protobuf_path}
NO_DEFAULT_PATH
PATH_SUFFIXES "include")

find_library (PROTOBUF_LIBRARY NAMES protobuf libprotobuf HINTS
Expand All @@ -122,7 +120,6 @@ else()

find_program(PROTOBUF_EXECUTABLE protoc HINTS
${_protobuf_path}
NO_DEFAULT_PATH
PATH_SUFFIXES "bin")
endif ()

Expand Down
3 changes: 1 addition & 2 deletions cmake_modules/FindSnappy.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,13 @@ message (STATUS "SNAPPY_HOME: ${SNAPPY_HOME}")

find_path (SNAPPY_INCLUDE_DIR snappy.h HINTS
${_snappy_path}
NO_DEFAULT_PATH
PATH_SUFFIXES "include")

find_library (SNAPPY_LIBRARY NAMES snappy HINTS
${_snappy_path}
PATH_SUFFIXES "lib" "lib64")

find_library (SNAPPY_STATIC_LIB NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX} HINTS
find_library (SNAPPY_STATIC_LIB NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}snappy${CMAKE_STATIC_LIBRARY_SUFFIX} HINTS
${_snappy_path}
PATH_SUFFIXES "lib" "lib64")

Expand Down
1 change: 0 additions & 1 deletion cmake_modules/FindZLIB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ message (STATUS "ZLIB_HOME: ${ZLIB_HOME}")

find_path (ZLIB_INCLUDE_DIR zlib.h HINTS
${_zlib_path}
NO_DEFAULT_PATH
PATH_SUFFIXES "include")

if (NOT ZLIB_STATIC_LIB_NAME)
Expand Down
1 change: 0 additions & 1 deletion cmake_modules/FindZSTD.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ message (STATUS "ZSTD_HOME: ${ZSTD_HOME}")

find_path (ZSTD_INCLUDE_DIR zstd.h HINTS
${_zstd_path}
NO_DEFAULT_PATH
PATH_SUFFIXES "include")

find_library (ZSTD_LIBRARY NAMES zstd HINTS
Expand Down
Loading