Skip to content

Commit 1dbd8ac

Browse files
Johannes KauffmannJohannesKauffmann
authored andcommitted
CMake: group build options by type
First general build options, then (optional) dependencies, lastly the examples. Rewrite WITH_XCB description to clarify that this concerns an example. There are no functional changes. Signed-off-by: Johannes Kauffmann <johanneskauffmann@hotmail.com>
1 parent f2a118f commit 1dbd8ac

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

CMakeLists.txt

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,28 +55,30 @@ option(LIBVNCSERVER_INSTALL "Generate installation target" ON)
5555
option(WITH_LIBVNCSERVER "Build libvncserver" ON)
5656
option(WITH_LIBVNCCLIENT "Build libvncclient" ON)
5757
option(BUILD_SHARED_LIBS "Build shared libraries" ${UNIX})
58+
option(WITH_TESTS "Build tests" ON)
59+
option(WITH_THREADS "Search for a threading library to build with multithreading support" ON)
60+
option(PREFER_WIN32THREADS "When searching for a threading library, prefer win32 threads if they are found" OFF)
61+
option(WITH_TIGHTVNC_FILETRANSFER "Enable filetransfer if there is pthreads support" ON)
62+
option(WITH_24BPP "Allow 24 bpp" ON)
63+
option(WITH_IPv6 "Enable IPv6 Support" ON)
64+
option(WITH_WEBSOCKETS "Build with websockets support" ON)
65+
# (optional) dependencies
5866
option(WITH_ZLIB "Search for the zlib compression library to support additional encodings" ON)
5967
option(WITH_LZO "Search for the LZO compression library to omit internal miniLZO implementation" ON)
6068
option(WITH_JPEG "Search for the libjpeg compression library to support additional encodings" ON)
6169
option(WITH_PNG "Search for the PNG compression library to support additional encodings" ON)
62-
option(WITH_SDL "Search for the Simple Direct Media Layer library to build an example SDL vnc client" ON)
63-
option(WITH_GTK "Search for the GTK library to build an example GTK vnc client" ON)
64-
option(WITH_LIBSSHTUNNEL "Search for libsshtunnel to build an example ssh-tunneled client" ON)
65-
option(WITH_THREADS "Search for a threading library to build with multithreading support" ON)
66-
option(PREFER_WIN32THREADS "When searching for a threading library, prefer win32 threads if they are found" OFF)
6770
option(WITH_GNUTLS "Search for the GnuTLS secure communications library to support TLS" ON)
6871
option(WITH_OPENSSL "Search for the OpenSSL cryptography library to support TLS and use as crypto backend" ON)
6972
option(WITH_SYSTEMD "Search for libsystemd to build with systemd socket activation support" ON)
7073
option(WITH_GCRYPT "Search for Libgcrypt to use as crypto backend" ON)
71-
option(WITH_FFMPEG "Search for FFMPEG to build an example VNC to MPEG encoder" ON)
72-
option(WITH_TIGHTVNC_FILETRANSFER "Enable filetransfer if there is pthreads support" ON)
73-
option(WITH_24BPP "Allow 24 bpp" ON)
74-
option(WITH_IPv6 "Enable IPv6 Support" ON)
75-
option(WITH_WEBSOCKETS "Build with websockets support" ON)
7674
option(WITH_SASL "Build with SASL support" ON)
77-
option(WITH_XCB "Build with XCB support" ON)
75+
# examples
7876
option(WITH_EXAMPLES "Build examples" ON)
79-
option(WITH_TESTS "Build tests" ON)
77+
option(WITH_SDL "Search for the Simple Direct Media Layer library to build an example SDL vnc client" ON)
78+
option(WITH_GTK "Search for the GTK library to build an example GTK vnc client" ON)
79+
option(WITH_LIBSSHTUNNEL "Search for libsshtunnel to build an example ssh-tunneled client" ON)
80+
option(WITH_FFMPEG "Search for FFMPEG to build an example VNC to MPEG encoder" ON)
81+
option(WITH_XCB "Build XCB server example" ON)
8082
option(WITH_QT "Build the Qt client example" ON)
8183

8284

0 commit comments

Comments
 (0)