Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 582954 | Differences between
and this patch

Collapse All | Expand All

(-)a/CMakeLists.txt (-36 / +42 lines)
Lines 89-112 if(NOT HAVE_B64_IN_LIBC) Link Here
89
    endif(HAVE_B64_IN_LIBRESOLV)
89
    endif(HAVE_B64_IN_LIBRESOLV)
90
endif(NOT HAVE_B64_IN_LIBC)
90
endif(NOT HAVE_B64_IN_LIBC)
91
91
92
if(Threads_FOUND)
92
if(WITH_THREADS)
93
  option(TIGHTVNC_FILETRANSFER "Enable filetransfer" ON)
93
  option(TIGHTVNC_FILETRANSFER "Enable filetransfer" ON)
94
endif(Threads_FOUND)
94
endif(WITH_THREADS)
95
if(ZLIB_FOUND)
95
if(WITH_ZLIB)
96
  set(LIBVNCSERVER_HAVE_LIBZ 1)
96
  set(LIBVNCSERVER_HAVE_LIBZ 1)
97
endif(ZLIB_FOUND)
97
endif(WITH_ZLIB)
98
if(JPEG_FOUND)
98
if(WITH_JPEG)
99
  set(LIBVNCSERVER_HAVE_LIBJPEG 1)
99
  set(LIBVNCSERVER_HAVE_LIBJPEG 1)
100
endif(JPEG_FOUND)
100
endif(WITH_JPEG)
101
if(PNG_FOUND)
101
if(WITH_PNG)
102
  set(LIBVNCSERVER_HAVE_LIBPNG 1)
102
  set(LIBVNCSERVER_HAVE_LIBPNG 1)
103
endif(PNG_FOUND)
103
endif(WITH_PNG)
104
option(LIBVNCSERVER_ALLOW24BPP "Allow 24 bpp" ON)
104
if(WITH_24BPP)
105
	option(LIBVNCSERVER_ALLOW24BPP "Allow 24 bpp" ON)
106
endif(WITH_24BPP)
105
107
106
pkg_check_modules(SYSTEMD "libsystemd")
108
pkg_check_modules(SYSTEMD "libsystemd")
107
if(SYSTEMD_FOUND)
109
if(WITH_SYSTEMD)
108
  option(LIBVNCSERVER_WITH_SYSTEMD "Build with systemd socket activation support" ON)
110
  option(LIBVNCSERVER_WITH_SYSTEMD "Build with systemd socket activation support" ON)
109
endif(SYSTEMD_FOUND)
111
endif(WITH_SYSTEMD)
110
112
111
if(LIBVNCSERVER_WITH_SYSTEMD)
113
if(LIBVNCSERVER_WITH_SYSTEMD)
112
  add_definitions(-DLIBVNCSERVER_WITH_SYSTEMD)
114
  add_definitions(-DLIBVNCSERVER_WITH_SYSTEMD)
Lines 114-126 if(LIBVNCSERVER_WITH_SYSTEMD) Link Here
114
  set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ${SYSTEMD_LIBRARIES})
116
  set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ${SYSTEMD_LIBRARIES})
115
endif(LIBVNCSERVER_WITH_SYSTEMD)
117
endif(LIBVNCSERVER_WITH_SYSTEMD)
116
118
117
if(GNUTLS_FOUND)
119
if(WITH_GNUTLS)
118
  set(LIBVNCSERVER_WITH_CLIENT_TLS 1)
120
  set(LIBVNCSERVER_WITH_CLIENT_TLS 1)
119
  option(LIBVNCSERVER_WITH_WEBSOCKETS "Build with websockets support (gnutls)" ON)
121
  option(LIBVNCSERVER_WITH_WEBSOCKETS "Build with websockets support (gnutls)" ON)
120
  set(WEBSOCKET_LIBRARIES ${RESOLV_LIB} ${GNUTLS_LIBRARIES})
122
  set(WEBSOCKET_LIBRARIES ${RESOLV_LIB} ${GNUTLS_LIBRARIES})
121
  set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_gnutls ${LIBVNCSERVER_DIR}/rfbcrypto_gnutls)
123
  set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_gnutls ${LIBVNCSERVER_DIR}/rfbcrypto_gnutls)
122
  include_directories(${GNUTLS_INCLUDE_DIR})
124
  include_directories(${GNUTLS_INCLUDE_DIR})
123
elseif(OPENSSL_FOUND)
125
elseif(WITH_SSL)
124
  option(LIBVNCSERVER_WITH_WEBSOCKETS "Build with websockets support (openssl)" ON)
126
  option(LIBVNCSERVER_WITH_WEBSOCKETS "Build with websockets support (openssl)" ON)
125
  set(WEBSOCKET_LIBRARIES ${RESOLV_LIB} ${OPENSSL_LIBRARIES})
127
  set(WEBSOCKET_LIBRARIES ${RESOLV_LIB} ${OPENSSL_LIBRARIES})
126
  set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_openssl ${LIBVNCSERVER_DIR}/rfbcrypto_openssl)
128
  set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_openssl ${LIBVNCSERVER_DIR}/rfbcrypto_openssl)
Lines 131-141 else() Link Here
131
  set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_none.c ${LIBVNCSERVER_DIR}/rfbcrypto_included.c ${COMMON_DIR}/md5.c ${COMMON_DIR}/sha1.c)
133
  set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_none.c ${LIBVNCSERVER_DIR}/rfbcrypto_included.c ${COMMON_DIR}/md5.c ${COMMON_DIR}/sha1.c)
132
endif()
134
endif()
133
135
134
if(LIBGCRYPT_LIBRARIES)
136
if(WITH_GCRYPT AND LIBGCRYPT_LIBRARIES)
135
  message(STATUS "Found libgcrypt: ${LIBGCRYPT_LIBRARIES}")
137
  message(STATUS "Found libgcrypt: ${LIBGCRYPT_LIBRARIES}")
136
  set(LIBVNCSERVER_WITH_CLIENT_GCRYPT 1)
138
  set(LIBVNCSERVER_WITH_CLIENT_GCRYPT 1)
137
  set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ${LIBGCRYPT_LIBRARIES})
139
  set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ${LIBGCRYPT_LIBRARIES})
138
endif(LIBGCRYPT_LIBRARIES)
140
endif(WITH_GCRYPT AND LIBGCRYPT_LIBRARIES)
139
141
140
142
141
check_include_file("endian.h"      LIBVNCSERVER_HAVE_ENDIAN_H)
143
check_include_file("endian.h"      LIBVNCSERVER_HAVE_ENDIAN_H)
Lines 162-168 check_function_exists(vfork LI Link Here
162
check_function_exists(vprintf         LIBVNCSERVER_HAVE_VPRINTF)
164
check_function_exists(vprintf         LIBVNCSERVER_HAVE_VPRINTF)
163
165
164
166
165
if(LIBVNCSERVER_HAVE_WS2TCPIP_H AND LIBVNCSERVER_HAVE_VPRINTF)
167
if(LIBVNCSERVER_HAVE_WS2TCPIP_H AND LIBVNCSERVER_HAVE_VPRINTF AND WITH_IPV6)
166
	option(LIBVNCSERVER_IPv6 "Enable IPv6 Support" ON)
168
	option(LIBVNCSERVER_IPv6 "Enable IPv6 Support" ON)
167
endif()
169
endif()
168
170
Lines 228-239 set(LIBVNCCLIENT_SOURCES Link Here
228
    ${COMMON_DIR}/minilzo.c
230
    ${COMMON_DIR}/minilzo.c
229
)
231
)
230
232
231
if(GNUTLS_FOUND)
233
if(WITH_GNUTLS)
232
  set(LIBVNCCLIENT_SOURCES
234
  set(LIBVNCCLIENT_SOURCES
233
    ${LIBVNCCLIENT_SOURCES}
235
    ${LIBVNCCLIENT_SOURCES}
234
    ${LIBVNCCLIENT_DIR}/tls_gnutls.c
236
    ${LIBVNCCLIENT_DIR}/tls_gnutls.c
235
  )
237
  )
236
elseif(OPENSSL_FOUND)
238
elseif(WITH_SSL)
237
  set(LIBVNCCLIENT_SOURCES
239
  set(LIBVNCCLIENT_SOURCES
238
    ${LIBVNCCLIENT_SOURCES}
240
    ${LIBVNCCLIENT_SOURCES}
239
    ${LIBVNCCLIENT_DIR}/tls_openssl.c
241
    ${LIBVNCCLIENT_DIR}/tls_openssl.c
Lines 245-251 else() Link Here
245
  )
247
  )
246
endif()
248
endif()
247
249
248
if(ZLIB_FOUND)
250
if(WITH_ZLIB)
249
  add_definitions(-DLIBVNCSERVER_HAVE_LIBZ)
251
  add_definitions(-DLIBVNCSERVER_HAVE_LIBZ)
250
  include_directories(${ZLIB_INCLUDE_DIR})
252
  include_directories(${ZLIB_INCLUDE_DIR})
251
  set(LIBVNCSERVER_SOURCES
253
  set(LIBVNCSERVER_SOURCES
Lines 255-273 if(ZLIB_FOUND) Link Here
255
    ${LIBVNCSERVER_DIR}/zrleoutstream.c
257
    ${LIBVNCSERVER_DIR}/zrleoutstream.c
256
    ${LIBVNCSERVER_DIR}/zrlepalettehelper.c
258
    ${LIBVNCSERVER_DIR}/zrlepalettehelper.c
257
  )
259
  )
258
endif(ZLIB_FOUND)
260
endif(WITH_ZLIB)
259
261
260
if(JPEG_FOUND)
262
if(WITH_JPEG)
261
  add_definitions(-DLIBVNCSERVER_HAVE_LIBJPEG)
263
  add_definitions(-DLIBVNCSERVER_HAVE_LIBJPEG)
262
  include_directories(${JPEG_INCLUDE_DIR})
264
  include_directories(${JPEG_INCLUDE_DIR})
263
  set(TIGHT_C ${LIBVNCSERVER_DIR}/tight.c ${COMMON_DIR}/turbojpeg.c)
265
  set(TIGHT_C ${LIBVNCSERVER_DIR}/tight.c ${COMMON_DIR}/turbojpeg.c)
264
endif(JPEG_FOUND)
266
endif(WITH_JPEG)
265
267
266
if(PNG_FOUND)
268
if(WITH_PNG)
267
  add_definitions(-DLIBVNCSERVER_HAVE_LIBPNG)
269
  add_definitions(-DLIBVNCSERVER_HAVE_LIBPNG)
268
  include_directories(${PNG_INCLUDE_DIR})
270
  include_directories(${PNG_INCLUDE_DIR})
269
  set(TIGHT_C ${LIBVNCSERVER_DIR}/tight.c ${COMMON_DIR}/turbojpeg.c)
271
  set(TIGHT_C ${LIBVNCSERVER_DIR}/tight.c ${COMMON_DIR}/turbojpeg.c)
270
endif(PNG_FOUND)
272
endif(WITH_PNG)
271
273
272
set(LIBVNCSERVER_SOURCES
274
set(LIBVNCSERVER_SOURCES
273
    ${LIBVNCSERVER_SOURCES}
275
    ${LIBVNCSERVER_SOURCES}
Lines 336-347 set(LIBVNCSERVER_TESTS Link Here
336
    vncev
338
    vncev
337
  )
339
  )
338
340
339
if(Threads_FOUND)
341
if(WITH_THREADS)
340
  set(LIBVNCSERVER_TESTS
342
  set(LIBVNCSERVER_TESTS
341
    ${LIBVNCSERVER_TESTS}
343
    ${LIBVNCSERVER_TESTS}
342
    blooptest
344
    blooptest
343
  )
345
  )
344
endif(Threads_FOUND)
346
endif(WITH_THREADS)
345
347
346
if(TIGHTVNC_FILETRANSFER)
348
if(TIGHTVNC_FILETRANSFER)
347
  set(LIBVNCSERVER_TESTS
349
  set(LIBVNCSERVER_TESTS
Lines 362-375 set(LIBVNCCLIENT_TESTS Link Here
362
    ppmtest
364
    ppmtest
363
)
365
)
364
366
365
if(SDL_FOUND)
367
if(WITH_SDL)
366
  include_directories(${SDL_INCLUDE_DIR})
368
  include_directories(${SDL_INCLUDE_DIR})
367
  set(LIBVNCCLIENT_TESTS
369
  set(LIBVNCCLIENT_TESTS
368
    ${LIBVNCCLIENT_TESTS}
370
    ${LIBVNCCLIENT_TESTS}
369
    SDLvncviewer
371
    SDLvncviewer
370
  )
372
  )
371
  set(SDLvncviewer_EXTRA_SOURCES scrap.c)
373
  set(SDLvncviewer_EXTRA_SOURCES scrap.c)
372
endif(SDL_FOUND)
374
endif(WITH_SDL)
373
375
374
if(HAVE_FFMPEG)
376
if(HAVE_FFMPEG)
375
  set(LIBVNCCLIENT_TESTS
377
  set(LIBVNCCLIENT_TESTS
Lines 380-395 endif(HAVE_FFMPEG) Link Here
380
382
381
383
382
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/examples)
384
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/examples)
383
foreach(test ${LIBVNCSERVER_TESTS})
385
if(WITH_TESTS)
384
  add_executable(examples_${test} ${LIBVNCSRVTEST_DIR}/${test}.c)
386
  foreach(test ${LIBVNCSERVER_TESTS})
385
  target_link_libraries(examples_${test} vncserver ${CMAKE_THREAD_LIBS_INIT})
387
    add_executable(examples_${test} ${LIBVNCSRVTEST_DIR}/${test}.c)
386
endforeach(test ${LIBVNCSERVER_TESTS})
388
    target_link_libraries(examples_${test} vncserver ${CMAKE_THREAD_LIBS_INIT})
389
  endforeach(test ${LIBVNCSERVER_TESTS})
390
endif(WITH_TESTS)
387
391
388
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/client_examples)
392
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/client_examples)
389
foreach(test ${LIBVNCCLIENT_TESTS})
393
if(WITH_TESTS)
390
  add_executable(client_examples_${test} ${LIBVNCCLITEST_DIR}/${test}.c ${LIBVNCCLITEST_DIR}/${${test}_EXTRA_SOURCES} )
394
  foreach(test ${LIBVNCCLIENT_TESTS})
391
  target_link_libraries(client_examples_${test} vncclient ${CMAKE_THREAD_LIBS_INIT} ${X11_LIBRARIES} ${SDL_LIBRARY} ${FFMPEG_LIBRARIES})
395
    add_executable(client_examples_${test} ${LIBVNCCLITEST_DIR}/${test}.c ${LIBVNCCLITEST_DIR}/${${test}_EXTRA_SOURCES} )
392
endforeach(test ${LIBVNCCLIENT_TESTS})
396
    target_link_libraries(client_examples_${test} vncclient ${CMAKE_THREAD_LIBS_INIT} ${X11_LIBRARIES} ${SDL_LIBRARY} ${FFMPEG_LIBRARIES})
397
  endforeach(test ${LIBVNCCLIENT_TESTS})
398
endif(WITH_TESTS)
393
399
394
install_targets(/lib vncserver)
400
install_targets(/lib vncserver)
395
install_targets(/lib vncclient)
401
install_targets(/lib vncclient)

Return to bug 582954