diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 49b1a2a24b5578561fdab0f46d117a82ffd35319..3b81c31e62b0c9b579cb4f6bcd485efe09135827 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,9 +35,10 @@ SET(EWMSCP_INCLUDES)
 SET(EWMSCP_OPTIONS)
 SET(EWMSCP_LIBS "pthread")
 if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
-	list(APPEND EWMSCP_LIBS "atomic")
+	SET(SYSTEM_SPECIAL_LIBS "atomic")
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-psabi")
 endif()
+list(APPEND EWMSCP_LIBS ${SYSTEM_SPECIAL_LIBS})
 SET(EWMSCP_SOURCES ewmscp.cpp copyRequest.cpp block.cpp md5sum.cpp md5.c
 genericStat.cpp outputHandler.cpp timer.cpp)
 list(APPEND EWMSCP_SOURCES ${OPTION_SRCS} ${OPTION_CHRONO})
@@ -132,7 +133,9 @@ install(TARGETS inotify_watch DESTINATION bin)
 add_executable(truncate_file truncate_file.cpp escapism.cpp timer.cpp ${OPTION_SRCS} ${GPFS_FCNTL})
 add_dependencies(truncate_file gitrev)
 if (GPFS_FOUND)
-	target_link_libraries(truncate_file ${GPFS_LIBRARIES})
+	target_link_libraries(truncate_file ${GPFS_LIBRARIES} ${SYSTEM_SPECIAL_LIBS})
+else()
+	target_link_libraries(truncate_file ${SYSTEM_SPECIAL_LIBS})
 endif()
 install(TARGETS truncate_file DESTINATION bin)
 
@@ -178,11 +181,7 @@ target_link_libraries(statvfs pthread)
 install(TARGETS statvfs DESTINATION bin)
 
 add_executable(dirCount dirCount.cpp timer.cpp ${OPTION_SRCS})
-if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
-	target_link_libraries(dirCount pthread atomic)
-else()
-	target_link_libraries(dirCount pthread)
-endif()
+target_link_libraries(dirCount pthread ${SYSTEM_SPECIAL_LIBS})
 install(TARGETS dirCount DESTINATION bin)
 
 add_executable(dateTest dateTest.cpp ${OPTION_SRCS} ${OPTION_CHRONO})