* better atomic linking checks

mgerhardy · Feb 12, 2015 · f811dd5 · f811dd5
1 parent 021bc3d
commit f811dd5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/ai/CMakeLists.txt b/src/ai/CMakeLists.txt
@@ -1,3 +1,6 @@
+include(CheckFunctionExists)
+include(CheckLibraryExists)
+
 file(GLOB_RECURSE SRC *.cpp *.h)
 
 set(DEPS ${CMAKE_THREAD_LIBS_INIT} ${GOOGLE_PROFILER_LIB} ${GOOGLE_TCMALLOC_LIB})
@@ -45,7 +48,7 @@ elseif (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
 	if (NOT HAVE___ATOMIC_FETCH_ADD_4)
 		check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC)
 		if (HAVE_LIBATOMIC)
-			list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
+			list(APPEND DEPS "-latomic")
 		endif()
 	endif()
 endif()

diff --git a/src/run/CMakeLists.txt b/src/run/CMakeLists.txt
@@ -1,3 +1,6 @@
+include(CheckFunctionExists)
+include(CheckLibraryExists)
+
 if (SIMPLEAI_RUN)
 	if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
 	elseif (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin")
@@ -11,5 +14,17 @@ if (SIMPLEAI_RUN)
 	link_directories(${SIMPLEAI_BINARY_DIR}/src/ai)
 	file(GLOB_RECURSE SRC ${SIMPLEAI_SOURCE_DIR}/src/run/*.cpp ${SIMPLEAI_SOURCE_DIR}/src/run/*.h)
 	add_executable(simpleai-run ${SRC})
-	target_link_libraries(simpleai-run simpleai ${CMAKE_THREAD_LIBS_INIT} -latomic ${GOOGLE_PROFILER_LIB} ${GOOGLE_TCMALLOC_LIB})
+	if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
+	elseif (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin")
+	elseif (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
+		check_function_exists(__atomic_fetch_add_4 HAVE___ATOMIC_FETCH_ADD_4)
+		if (NOT HAVE___ATOMIC_FETCH_ADD_4)
+			check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC)
+			if (HAVE_LIBATOMIC)
+				list(APPEND DEPS "-latomic")
+			endif()
+		endif()
+	endif()
+
+	target_link_libraries(simpleai-run simpleai ${CMAKE_THREAD_LIBS_INIT} ${DEPS} ${GOOGLE_PROFILER_LIB} ${GOOGLE_TCMALLOC_LIB})
 endif()