Merge branch 'hotfix-1.7.2' into develop

2019-09-11 00:54:47 +08:00
parent 6cde88b783 1e65dd8d66
commit a65eec2bb9
16 changed files with 224 additions and 67 deletions
--- a/build/cmake/compilers.cmake
+++ b/build/cmake/compilers.cmake
@@ -38,13 +38,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") #  AN
 endif()


-if (APPLE AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")                    # APPLE Clang
-    target_compile_options(nana PUBLIC -stdlib=libstdc++)
-endif ()
-
-

 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
    target_compile_options(nana PRIVATE -fmax-errors=3)
 endif()
-