Skip to content

Commit 943aa0b

Browse files
committed
include_directories with SYSTEM for system-headers such as boost, to avoid warnings-checking on those 3rd party headers
1 parent e8b3509 commit 943aa0b

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

Release/CMakeLists.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ if(ANDROID)
149149
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
150150
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pedantic")
151151
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes -Wno-pointer-arith")
152-
include_directories(
152+
include_directories(SYSTEM
153153
"${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/4.8/include"
154154
"${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/include"
155155
"${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/4.8/include/backward"
@@ -197,7 +197,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
197197
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
198198

199199
# These settings can be used by the test targets
200-
set(Casablanca_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
200+
set(Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
201201
if (NOT CPPREST_EXCLUDE_WEBSOCKETS)
202202
find_path(WEBSOCKETPP_CONFIG websocketpp-config.cmake
203203
HINTS /usr/lib/cmake/websocketpp)
@@ -207,20 +207,19 @@ if (NOT CPPREST_EXCLUDE_WEBSOCKETS)
207207
include(${WEBSOCKETPP_CONFIG}/websocketpp-config.cmake)
208208
include(${WEBSOCKETPP_CONFIG}/websocketpp-configVersion.cmake)
209209
message("-- Found websocketpp version " ${PACKAGE_VERSION} " on system")
210-
set(Casablanca_INCLUDE_DIRS ${Casablanca_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${WEBSOCKETPP_INCLUDE_DIR})
210+
set(Casablanca_SYSTEM_INCLUDE_DIRS ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${WEBSOCKETPP_INCLUDE_DIR})
211211
else(WEBSOCKETPP_CONFIG AND WEBSOCKETPP_CONFIG_VERSION)
212-
set(Casablanca_INCLUDE_DIRS ${Casablanca_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/libs/websocketpp)
212+
set(Casablanca_SYSTEM_INCLUDE_DIRS ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/libs/websocketpp)
213213
message("-- websocketpp not found, using the embedded version")
214214
endif(WEBSOCKETPP_CONFIG AND WEBSOCKETPP_CONFIG_VERSION)
215-
else()
216-
set(Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
217215
endif()
218216

219217
set(Casablanca_LIBRARY cpprest)
220218
set(Casablanca_LIBRARIES cpprest ${Boost_LIBRARIES})
221219

222220
# Everything in the project needs access to the casablanca include directories
223-
include_directories(${Casablanca_INCLUDE_DIRS})
221+
include_directories( ${Casablanca_INCLUDE_DIRS})
222+
include_directories(SYSTEM ${Casablanca_SYSTEM_INCLUDE_DIRS})
224223

225224
# Finally, the tests all use the same style declaration to build themselves, so we use a function
226225
function(add_casablanca_test NAME SOURCES_VAR)

Release/libs/websocketpp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
190190

191191
if (Boost_FOUND)
192192
# Boost is a project wide global dependency.
193-
include_directories (${Boost_INCLUDE_DIRS})
193+
include_directories (SYSTEM ${Boost_INCLUDE_DIRS})
194194
link_directories (${Boost_LIBRARY_DIRS})
195195

196196
# Pretty print status

Release/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include_directories(../include pch)
22
if (NOT CPPREST_EXCLUDE_WEBSOCKETS)
3-
include_directories(${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
3+
include_directories(SYSTEM ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
44
endif()
55

66
add_definitions(${WARNINGS})

0 commit comments

Comments
 (0)