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

Update CMakeLists.txt to fix MacOS build #14160

Merged
merged 13 commits into from
Dec 27, 2023
Merged

Update CMakeLists.txt to fix MacOS build #14160

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a1c75fe
Update CMakeLists.txt to fix MacOS build
superfloh247 Dec 25, 2023
859b476
Update CMakeLists.txt
superfloh247 Dec 25, 2023
afb701e
and clang also back to comment, and "non-recent"
Desour Dec 25, 2023
98673b1
Update CMakeLists.txt
superfloh247 Dec 26, 2023
65a8070
Update CMakeLists.txt
superfloh247 Dec 26, 2023
b3693cb
Update CMakeLists.txt
superfloh247 Dec 26, 2023
80a3e84
Update CMakeLists.txt
superfloh247 Dec 26, 2023
54f5d86
revert to working code
superfloh247 Dec 26, 2023
f50f6e2
Merge branch 'minetest:master' into patch-4
superfloh247 Dec 26, 2023
e603174
Update CMakeLists.txt
superfloh247 Dec 26, 2023
1ef0373
Update CMakeLists.txt
superfloh247 Dec 26, 2023
9082c89
test
sfan5 Dec 27, 2023
94e1919
test2
sfan5 Dec 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,12 +317,13 @@ endif()
# On clang and gcc, some functionalities of std::atomic require -latomic.
# See <https://en.cppreference.com/w/cpp/atomic/atomic#Notes>.
# Note that find_library does not reliably find it so we have to resort to this.
# Also, passing -latomic is not always the same as adding atomic to the library list.
Desour marked this conversation as resolved.
Show resolved Hide resolved
include(CheckCSourceCompiles)
set(CMAKE_REQUIRED_LIBRARIES "-latomic")
check_c_source_compiles("int main(){}" HAVE_LINK_ATOMIC)
set(CMAKE_REQUIRED_LIBRARIES "")
if(HAVE_LINK_ATOMIC)
set(PLATFORM_LIBS ${PLATFORM_LIBS} atomic)
set(PLATFORM_LIBS ${PLATFORM_LIBS} "-latomic")
endif()

check_include_files(endian.h HAVE_ENDIAN_H)
Expand Down