blob: 727126e7f886f7176e0f455eae5dbc2e54f225e4 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
--- build/CMakeLists.txt.orig 2016-01-12 15:14:22 UTC
+++ build/CMakeLists.txt
@@ -209,7 +209,7 @@ else()
endif ()
if (WITH_PCH)
- include_directories(${CMAKE_BINARY_DIR})
+ include_directories( BEFORE ${CMAKE_BINARY_DIR})
add_library(stdafx STATIC "${CMAKE_SOURCE_DIR}/stdafx.cpp")
if(MSVC)
target_compile_options(stdafx PRIVATE /Ycstdafx.h /Zm155)
@@ -246,11 +246,9 @@ if(NOT DEFINED OPENSSL_INCLUDE_DIR)
message(SEND_ERROR "Could not find OpenSSL. Please download and install it first!")
endif()
-find_package ( MiniUPnPc )
-if (MINIUPNPC_FOUND)
- include_directories( ${MINIUPNPC_INCLUDE_DIR} )
-else ()
- set(WITH_UPNP OFF)
+if (WITH_UPNP)
+ find_package ( MiniUPnPc REQUIRED )
+ include_directories( SYSTEM ${MINIUPNPC_INCLUDE_DIR} )
endif()
find_package ( ZLIB )
@@ -289,7 +287,7 @@ endif ()
link_directories(${CMAKE_CURRENT_BINARY_DIR}/zlib/lib ${ZLIB_ROOT}/lib)
# load includes
-include_directories( ${Boost_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
+include_directories( SYSTEM ${Boost_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
# show summary
message(STATUS "---------------------------------------")
|
