Skip to content
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

Jump to bottom

Add filesystem related lib #1940

Open
wants to merge 9 commits into
base: unstable
Choose a base branch
from
Open

Add filesystem related lib #1940

Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
90b8f81
add fs lib
Smityz Dec 18, 2023
132b81d
update
Smityz Dec 18, 2023
c5936cb
add condition
Smityz Dec 18, 2023
3a677ad
change condition
Smityz Dec 18, 2023
aa772fc
change condition
Smityz Dec 18, 2023
8cca938
change condition
Smityz Dec 19, 2023
750780b
lint
Smityz Dec 19, 2023
820e7cc
Merge branch 'unstable' into fix
Smityz Dec 19, 2023
2bde7f3
Merge branch 'unstable' into fix
Smityz Mar 29, 2024
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
11 changes: 10 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ endif()
find_package(Threads REQUIRED)

list(APPEND EXTERNAL_LIBS glog)
list(APPEND EXTERNAL_LIBS snappy)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmmm. Why is it deleted?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

ld: warning: ignoring duplicate libraries: '_deps/snappy-build/libsnappy.a', 'clang_17.0_cxx17_64_relwithdebinfo/libtbb.a'

I found a warning when compiling with clang 17. It appears that deleting this line does not affect the compilation process.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer to explicit list this dep instead of depend on transitive dep.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

list(APPEND EXTERNAL_LIBS rocksdb_with_headers)
list(APPEND EXTERNAL_LIBS event_with_headers)
list(APPEND EXTERNAL_LIBS lz4)
Expand All @@ -169,6 +168,16 @@ list(APPEND EXTERNAL_LIBS Threads::Threads)
list(APPEND EXTERNAL_LIBS ${Backtrace_LIBRARY})
list(APPEND EXTERNAL_LIBS xxhash)
list(APPEND EXTERNAL_LIBS span-lite)
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9)
list(APPEND EXTERNAL_LIBS stdc++fs)
endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13)
if (NOT APPLE)
list(APPEND EXTERNAL_LIBS stdc++fs)
else()
list(APPEND EXTERNAL_LIBS c++fs)
endif()
endif()

# Add git sha to version.h
find_package(Git REQUIRED)
Expand Down