diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index de85a6fe6..69170ab7f 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -220,8 +220,8 @@ if(ENABLE_SHARED)
 
 	if(BELCARD_FOUND)
 		if(APPLE)
-        	        set_target_properties(linphone PROPERTIES LINK_FLAGS "-stdlib=libc++")
-        	endif()
+	        set_target_properties(linphone PROPERTIES LINK_FLAGS "-stdlib=libc++")
+    	endif()
 	endif()
 
 	set_target_properties(linphone PROPERTIES LINKER_LANGUAGE CXX)
diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt
index 401d1185e..c8d86c493 100644
--- a/tester/CMakeLists.txt
+++ b/tester/CMakeLists.txt
@@ -132,7 +132,11 @@ if (NOT ANDROID AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 	if (IOS)
 		set_source_files_properties(${RESOURCES_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 		add_executable(liblinphone_tester MACOSX_BUNDLE ${RESOURCES_FILES} ${SOURCE_FILES_C} ${SOURCE_FILES_OBJC})
-		set_target_properties(liblinphone_tester PROPERTIES LINK_FLAGS "${MEDIASTREAMER2_LDFLAGS}")
+		set(LINK_FLAGS ${MEDIASTREAMER2_LDFLAGS})
+		if(BELCARD_FOUND)
+		    set(LINK_FLAGS "${LINK_FLAGS} -stdlib=libc++")
+		endif()
+		set_target_properties(liblinphone_tester PROPERTIES LINK_FLAGS "${LINK_FLAGS}")
 	else()
 		add_executable(liblinphone_tester ${SOURCE_FILES_C} ${SOURCE_FILES_OBJC})
 	endif()
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 71a3acea5..a84ab373a 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -45,6 +45,11 @@ set(LP_GEN_WRAPPERS_LIBS
 	${XML2_LIBRARIES}
 	)
 
+set(LINK_FLAGS ${MEDIASTREAMER2_LDFLAGS})
+if(BELCARD_FOUND AND APPLE)
+    set(LINK_FLAGS "${LINK_FLAGS} -stdlib=libc++")
+endif()
+
 apply_compile_flags(LP_GEN_WRAPPERS_SOURCE_FILES "CPP" "CXX")
 add_executable(lp-gen-wrappers ${USE_BUNDLE} ${LP_GEN_WRAPPERS_SOURCE_FILES})
 target_link_libraries(lp-gen-wrappers ${LP_GEN_WRAPPERS_LIBS})
@@ -53,13 +58,13 @@ set(LP_AUTO_ANSWER_SOURCE_FILES	auto_answer.c)
 apply_compile_flags(LP_AUTO_ANSWER_SOURCE_FILES "CPP" "C")
 add_executable(lp-auto-answer ${USE_BUNDLE} ${LP_AUTO_ANSWER_SOURCE_FILES})
 target_link_libraries(lp-auto-answer ${LINPHONE_LIBS_FOR_TOOLS} ${MEDIASTREAMER2_LIBRARIES})
-set_target_properties(lp-auto-answer PROPERTIES LINK_FLAGS "${MEDIASTREAMER2_LDFLAGS}")
+set_target_properties(lp-auto-answer PROPERTIES LINK_FLAGS "${LINK_FLAGS}")
 
 set(LP_SENDMSG_SOURCE_FILES lpsendmsg.c)
 apply_compile_flags(LP_SENDMSG_SOURCE_FILES "CPP" "C")
 add_executable(lp-sendmsg ${USE_BUNDLE} ${LP_SENDMSG_SOURCE_FILES})
 target_link_libraries(lp-sendmsg ${LINPHONE_LIBS_FOR_TOOLS} ${ORTP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES})
-set_target_properties(lp-sendmsg PROPERTIES LINK_FLAGS "${MEDIASTREAMER2_LDFLAGS}")
+set_target_properties(lp-sendmsg PROPERTIES LINK_FLAGS "${LINK_FLAGS}")
 
 if (NOT IOS)
 	install(TARGETS lp-gen-wrappers