Merge branch 'master' of https://github.com/dyninst/dyninst into proc…

…control/doc/tracking
dyninst · Nov 28, 2016 · bfe13a8 · bfe13a8
2 parents 2a1f453 + abf2ce4
commit bfe13a8
Show file tree

Hide file tree

Showing 10 changed files with 128 additions and 129 deletions.
diff --git a/cmake/shared.cmake b/cmake/shared.cmake
@@ -3,7 +3,7 @@ set (DYNINST_MINOR_VERSION 2)
 set (DYNINST_PATCH_VERSION 0)
 
 # Debugging
-set(Boost_DEBUG 1)
+# set(Boost_DEBUG 1)
 
 add_definitions(-DBOOST_ALL_NO_LIB=1)
 set (SOVERSION "${DYNINST_MAJOR_VERSION}.${DYNINST_MINOR_VERSION}")

diff --git a/cmake/warnings.cmake b/cmake/warnings.cmake
@@ -4,7 +4,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wall -Wpointer-arith -Wcast-qual -Wo
 if (CMAKE_C_COMPILER_ID MATCHES GNU)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-align -Wno-non-template-friend -Wno-unused-local-typedefs -Wno-deprecated-declarations")
-endif (CMAKE_C_COMPILER_ID)
+endif (CMAKE_C_COMPILER_ID MATCHES GNU)
 elseif (MSVC)
 message(STATUS "TODO: Set up custom warning flags for MSVC")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4251 /wd4091 /wd4503")