This makes sure the compiler doesn't complain about problems in those files.pull/1574/head
@@ -1,5 +1,5 @@ | |||
include_directories(${CMAKE_SOURCE_DIR}/common) | |||
include_directories(${ZLIB_INCLUDE_DIRS}) | |||
include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) | |||
add_library(rdr STATIC | |||
AESInStream.cxx | |||
@@ -22,11 +22,11 @@ add_library(rdr STATIC | |||
target_link_libraries(rdr ${ZLIB_LIBRARIES} os) | |||
if(GNUTLS_FOUND) | |||
include_directories(${GNUTLS_INCLUDE_DIR}) | |||
include_directories(SYSTEM ${GNUTLS_INCLUDE_DIR}) | |||
target_link_libraries(rdr ${GNUTLS_LIBRARIES}) | |||
endif() | |||
if (NETTLE_FOUND) | |||
include_directories(${NETTLE_INCLUDE_DIRS}) | |||
include_directories(SYSTEM ${NETTLE_INCLUDE_DIRS}) | |||
target_link_libraries(rdr ${NETTLE_LIBRARIES}) | |||
target_link_directories(rdr PUBLIC ${NETTLE_LIBRARY_DIRS}) | |||
endif() |
@@ -1,6 +1,6 @@ | |||
include_directories(${CMAKE_SOURCE_DIR}/common) | |||
include_directories(${JPEG_INCLUDE_DIR}) | |||
include_directories(${PIXMAN_INCLUDE_DIRS}) | |||
include_directories(SYSTEM ${JPEG_INCLUDE_DIR}) | |||
include_directories(SYSTEM ${PIXMAN_INCLUDE_DIRS}) | |||
add_library(rfb STATIC | |||
Blacklist.cxx | |||
@@ -77,7 +77,7 @@ if(ENABLE_H264 AND NOT H264_LIBS STREQUAL "NONE") | |||
elseif(H264_LIBS STREQUAL "WIN") | |||
target_sources(rfb PRIVATE H264WinDecoderContext.cxx) | |||
endif() | |||
include_directories(${H264_INCLUDE_DIRS}) | |||
include_directories(SYSTEM ${H264_INCLUDE_DIRS}) | |||
target_link_libraries(rfb ${H264_LIBRARIES}) | |||
target_link_directories(rfb PUBLIC ${H264_LIBRARY_DIRS}) | |||
endif() | |||
@@ -98,14 +98,14 @@ endif() | |||
if(GNUTLS_FOUND) | |||
target_sources(rfb PRIVATE CSecurityTLS.cxx SSecurityTLS.cxx) | |||
include_directories(${GNUTLS_INCLUDE_DIR}) | |||
include_directories(SYSTEM ${GNUTLS_INCLUDE_DIR}) | |||
target_link_libraries(rfb ${GNUTLS_LIBRARIES}) | |||
endif() | |||
if (NETTLE_FOUND) | |||
target_sources(rfb PRIVATE CSecurityDH.cxx CSecurityMSLogonII.cxx | |||
CSecurityRSAAES.cxx SSecurityRSAAES.cxx) | |||
include_directories(${NETTLE_INCLUDE_DIRS} ${GMP_INCLUDE_DIRS}) | |||
include_directories(SYSTEM ${NETTLE_INCLUDE_DIRS} ${GMP_INCLUDE_DIRS}) | |||
target_link_libraries(rfb ${HOGWEED_LIBRARIES} | |||
${NETTLE_LIBRARIES} ${GMP_LIBRARIES}) | |||
target_link_directories(rfb PUBLIC ${HOGWEED_LIBRARY_DIRS} |
@@ -1,5 +1,5 @@ | |||
include_directories(${CMAKE_SOURCE_DIR}/common) | |||
include_directories(${GETTEXT_INCLUDE_DIR}) | |||
include_directories(SYSTEM ${GETTEXT_INCLUDE_DIR}) | |||
add_library(test_util STATIC util.cxx) | |||
@@ -13,7 +13,7 @@ add_executable(encperf encperf.cxx) | |||
target_link_libraries(encperf test_util rfb) | |||
if (BUILD_VIEWER) | |||
include_directories(${FLTK_INCLUDE_DIR}) | |||
include_directories(SYSTEM ${FLTK_INCLUDE_DIR}) | |||
add_executable(fbperf | |||
fbperf.cxx | |||
${CMAKE_SOURCE_DIR}/vncviewer/PlatformPixelBuffer.cxx |
@@ -1,6 +1,6 @@ | |||
include_directories(${CMAKE_SOURCE_DIR}/common) | |||
include_directories(${CMAKE_SOURCE_DIR}/vncviewer) | |||
include_directories(${GETTEXT_INCLUDE_DIR}) | |||
include_directories(SYSTEM ${GETTEXT_INCLUDE_DIR}) | |||
add_executable(conv conv.cxx) | |||
target_link_libraries(conv rfb) |
@@ -1,4 +1,4 @@ | |||
include_directories(${X11_INCLUDE_DIR}) | |||
include_directories(SYSTEM ${X11_INCLUDE_DIR}) | |||
include_directories(${CMAKE_SOURCE_DIR}/common) | |||
include_directories(${CMAKE_SOURCE_DIR}/common/rfb) |
@@ -1,4 +1,4 @@ | |||
include_directories(${X11_INCLUDE_DIR}) | |||
include_directories(SYSTEM ${X11_INCLUDE_DIR}) | |||
include_directories(${CMAKE_SOURCE_DIR}/common) | |||
include_directories(${CMAKE_SOURCE_DIR}/unix/tx) |
@@ -1,4 +1,4 @@ | |||
include_directories(${X11_INCLUDE_DIR}) | |||
include_directories(SYSTEM ${X11_INCLUDE_DIR}) | |||
include_directories(${CMAKE_SOURCE_DIR}/unix/common) | |||
include_directories(${CMAKE_SOURCE_DIR}/unix/tx) | |||
include_directories(${CMAKE_SOURCE_DIR}/unix) |
@@ -1,5 +1,5 @@ | |||
include_directories(${FLTK_INCLUDE_DIR}) | |||
include_directories(${GETTEXT_INCLUDE_DIR}) | |||
include_directories(SYSTEM ${FLTK_INCLUDE_DIR}) | |||
include_directories(SYSTEM ${GETTEXT_INCLUDE_DIR}) | |||
include_directories(${CMAKE_SOURCE_DIR}/common) | |||