Merge pull request #1678

c833a39a cmake set atomic for android (MoroccanMalinois)
2017-02-08 12:53:19 +02:00 · 2017-02-08 12:53:19 +02:00 · 8d1562077f
parent d30b64f457 c833a39a4d
commit 8d1562077f
1 changed files with 3 additions and 0 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -619,6 +619,9 @@ endif()

 list(APPEND EXTRA_LIBRARIES ${CMAKE_DL_LIBS})

+if(ANDROID)
+  set(ATOMIC libatomic.a)
+endif()
 if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND ARCH_WIDTH EQUAL "32")
  find_library(ATOMIC atomic)
  list(APPEND EXTRA_LIBRARIES ${ATOMIC})