Merge release 2.4.4

This commit is contained in:
Andrey Kamaev
2013-03-04 19:29:40 +04:00
64 changed files with 11575 additions and 3169 deletions

View File

@@ -91,7 +91,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
endif()
# We need pthread's
if(UNIX AND NOT ANDROID)
if(UNIX AND NOT ANDROID AND NOT (APPLE AND CMAKE_COMPILER_IS_CLANGCXX))
add_extra_compiler_option(-pthread)
endif()