We should scope these as narrowely as possible to avoid side effects.tags/v1.12.90
@@ -231,8 +231,6 @@ if(NOT FOUND_LIBJPEG_TURBO) | |||
message(STATUS "WARNING: You are not using libjpeg-turbo. Performance will suffer.") | |||
endif() | |||
include_directories(${JPEG_INCLUDE_DIR}) | |||
option(BUILD_JAVA "Build Java version of the TigerVNC Viewer" FALSE) | |||
if(BUILD_JAVA) | |||
add_subdirectory(java) | |||
@@ -273,9 +271,7 @@ option(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication" ON | |||
if(ENABLE_GNUTLS) | |||
find_package(GnuTLS) | |||
if (GNUTLS_FOUND) | |||
include_directories(${GNUTLS_INCLUDE_DIR}) | |||
add_definitions("-DHAVE_GNUTLS") | |||
add_definitions(${GNUTLS_DEFINITIONS}) | |||
endif() | |||
endif() | |||
@@ -1,4 +1,5 @@ | |||
include_directories(${CMAKE_SOURCE_DIR}/common ${ZLIB_INCLUDE_DIRS}) | |||
include_directories(${CMAKE_SOURCE_DIR}/common) | |||
include_directories(${ZLIB_INCLUDE_DIRS}) | |||
add_library(rdr STATIC | |||
BufferedInStream.cxx | |||
@@ -19,6 +20,7 @@ add_library(rdr STATIC | |||
target_link_libraries(rdr ${ZLIB_LIBRARIES} os) | |||
if(GNUTLS_FOUND) | |||
include_directories(${GNUTLS_INCLUDE_DIR}) | |||
target_link_libraries(rdr ${GNUTLS_LIBRARIES}) | |||
endif() | |||
if(WIN32) |
@@ -1,4 +1,6 @@ | |||
include_directories(${CMAKE_SOURCE_DIR}/common ${JPEG_INCLUDE_DIR} ${PIXMAN_INCLUDE_DIRS} ${H264_INCLUDE_DIRS}) | |||
include_directories(${CMAKE_SOURCE_DIR}/common) | |||
include_directories(${JPEG_INCLUDE_DIR}) | |||
include_directories(${PIXMAN_INCLUDE_DIRS}) | |||
add_library(rfb STATIC | |||
Blacklist.cxx | |||
@@ -75,6 +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}) | |||
target_link_libraries(rfb ${H264_LIBRARIES}) | |||
target_link_directories(rfb PUBLIC ${H264_LIBRARY_DIRS}) | |||
endif() | |||
@@ -95,6 +98,7 @@ endif() | |||
if(GNUTLS_FOUND) | |||
target_sources(rfb PRIVATE CSecurityTLS.cxx SSecurityTLS.cxx) | |||
include_directories(${GNUTLS_INCLUDE_DIR}) | |||
target_link_libraries(rfb ${GNUTLS_LIBRARIES}) | |||
endif() | |||
@@ -1,6 +1,5 @@ | |||
include_directories(${GETTEXT_INCLUDE_DIR}) | |||
include_directories(${CMAKE_SOURCE_DIR}/common) | |||
include_directories(${GETTEXT_INCLUDE_DIR}) | |||
add_library(test_util STATIC util.cxx) | |||
@@ -1,5 +1,6 @@ | |||
include_directories(${CMAKE_SOURCE_DIR}/common) | |||
include_directories(${CMAKE_SOURCE_DIR}/vncviewer) | |||
include_directories(${GETTEXT_INCLUDE_DIR}) | |||
add_executable(conv conv.cxx) | |||
target_link_libraries(conv rfb) | |||
@@ -20,4 +21,4 @@ add_executable(unicode unicode.cxx) | |||
target_link_libraries(unicode rfb) | |||
add_executable(emulatemb emulatemb.cxx ../../vncviewer/EmulateMB.cxx) | |||
target_link_libraries(emulatemb rfb ${GETTEXT_LIBRARIES}) | |||
target_link_libraries(emulatemb rfb ${GETTEXT_LIBRARIES}) |