Simplify clang support.

Cherry-pick: 2f6c9dc

Author: chenshuo

.travis.yml

@@ -16,5 +16,4 @@ env:
   - BUILD_TYPE=debug
   - BUILD_TYPE=release
 script:
-  - if [ "$CXX" == "clang++" ]; then patch -p1 < clang.diff; fi
   - ./build.sh

CMakeLists.txt

@@ -8,6 +8,8 @@ if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE "Release")
 endif()
 
+option(MUDUO_BUILD_EXAMPLES ON)
+
 set(CXX_FLAGS
  -g
  # -DVALGRIND
@@ -32,9 +34,16 @@ set(CXX_FLAGS
 if(CMAKE_BUILD_BITS EQUAL 32)
   list(APPEND CXX_FLAGS "-m32")
 endif()
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  list(APPEND CXX_FLAGS "-Wno-null-dereference")
+  list(APPEND CXX_FLAGS "-Wno-sign-conversion")
+  list(APPEND CXX_FLAGS "-Wno-unused-local-typedef")
+  list(APPEND CXX_FLAGS "-Wno-unused-private-field")
+  list(APPEND CXX_FLAGS "-Wthread-safety")
+  list(REMOVE_ITEM CXX_FLAGS "-rdynamic")
+endif()
 string(REPLACE ";" " " CMAKE_CXX_FLAGS "${CXX_FLAGS}")
 
-set(CMAKE_CXX_COMPILER "g++")
 set(CMAKE_CXX_FLAGS_DEBUG "-O0")
 set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
@@ -96,7 +105,7 @@ message(STATUS "CXX_FLAGS = " ${CMAKE_CXX_FLAGS} " " ${CMAKE_CXX_FLAGS_${BUILD_T
 add_subdirectory(muduo/base)
 add_subdirectory(muduo/net)
 
-if(NOT MUDUO_BUILD_NO_EXAMPLES)
+if(MUDUO_BUILD_EXAMPLES)
   add_subdirectory(contrib)
   add_subdirectory(examples)
 else()

build.sh

@@ -6,7 +6,7 @@ SOURCE_DIR=`pwd`
 BUILD_DIR=${BUILD_DIR:-../build}
 BUILD_TYPE=${BUILD_TYPE:-release}
 INSTALL_DIR=${INSTALL_DIR:-../${BUILD_TYPE}-install-cpp11}
-BUILD_NO_EXAMPLES=${BUILD_NO_EXAMPLES:-0}
+CXX=${CXX:-g++}
 
 ln -sf $BUILD_DIR/$BUILD_TYPE-cpp11/compile_commands.json
 
@@ -15,7 +15,6 @@ mkdir -p $BUILD_DIR/$BUILD_TYPE-cpp11 \
   && cmake \
            -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
            -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \
-           -DMUDUO_BUILD_NO_EXAMPLES=$BUILD_NO_EXAMPLES \
            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
            $SOURCE_DIR \
   && make $*