@@ -149,7 +149,7 @@ if(ANDROID)
149
149
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing" )
150
150
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pedantic" )
151
151
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes -Wno-pointer-arith" )
152
- include_directories (
152
+ include_directories (SYSTEM
153
153
"${ANDROID_NDK} /sources/cxx-stl/gnu-libstdc++/4.8/include"
154
154
"${ANDROID_NDK} /sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/include"
155
155
"${ANDROID_NDK} /sources/cxx-stl/gnu-libstdc++/4.8/include/backward"
@@ -197,7 +197,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
197
197
set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR} /Binaries )
198
198
199
199
# 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 )
201
201
if (NOT CPPREST_EXCLUDE_WEBSOCKETS )
202
202
find_path (WEBSOCKETPP_CONFIG websocketpp-config.cmake
203
203
HINTS /usr/lib/cmake/websocketpp )
@@ -207,20 +207,19 @@ if (NOT CPPREST_EXCLUDE_WEBSOCKETS)
207
207
include (${WEBSOCKETPP_CONFIG} /websocketpp-config.cmake )
208
208
include (${WEBSOCKETPP_CONFIG} /websocketpp-configVersion.cmake )
209
209
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} )
211
211
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 )
213
213
message ("-- websocketpp not found, using the embedded version" )
214
214
endif (WEBSOCKETPP_CONFIG AND WEBSOCKETPP_CONFIG_VERSION )
215
- else ()
216
- set (Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} /include )
217
215
endif ()
218
216
219
217
set (Casablanca_LIBRARY cpprest )
220
218
set (Casablanca_LIBRARIES cpprest ${Boost_LIBRARIES} )
221
219
222
220
# 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} )
224
223
225
224
# Finally, the tests all use the same style declaration to build themselves, so we use a function
226
225
function (add_casablanca_test NAME SOURCES_VAR )
0 commit comments