Mercurial Mercurial > hedgewars-draft / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #62 from hedgewars/ci-patch-osx-atomic
authorAnton Malmygin <antonc27@mail.ru>
Wed, 15 May 2019 18:30:59 +0200
changeset 14981 372b25c6bdee
parent 14979 364b67d48279 (current diff)
parent 14980 5cd4edd71d22 (diff)
child 14982 575dbd7b5f43
Merge pull request #62 from hedgewars/ci-patch-osx-atomic Fix pas2c compilation on macOS
--- a/QTfrontend/CMakeLists.txt	Wed May 15 16:25:29 2019 +0000
+++ b/QTfrontend/CMakeLists.txt	Wed May 15 18:30:59 2019 +0200
@@ -248,7 +248,10 @@
 endif()
 
 if(CMAKE_CXX_COMPILER MATCHES "clang*")
-    list(APPEND HW_LINK_LIBS stdc++ m atomic)
+    list(APPEND HW_LINK_LIBS stdc++ m)
+    if(NOT APPLE)
+        list(APPEND HW_LINK_LIBS atomic)
+    endif()
 endif()
 
 if(WIN32 AND VCPKG_TOOLCHAIN)
hedgewars-draft