Merge branch 'master' into multicastvnc

Author: bk138

.travis.yml

@@ -1,5 +1,5 @@
 language: c
-dist: trusty
+dist: xenial
 sudo: required
 
 os:
@@ -10,14 +10,6 @@ compiler:
   - gcc
   - clang
 
-before_install:
-- |
-  if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
-    CMAKE_URL="http://www.cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz"
-    mkdir -p ${TRAVIS_BUILD_DIR}/deps/cmake && travis_retry wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${TRAVIS_BUILD_DIR}/deps/cmake
-    export PATH=${TRAVIS_BUILD_DIR}/deps/cmake/bin:${PATH}
-  fi
-
 # Build steps
 script:
   - mkdir build

CMakeLists.txt

@@ -35,6 +35,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/libvncserver ${CMAKE_CURRENT_SOURCE_DIR}/common)
 
 # all the build configuration switches
+option(LIBVNCSERVER_INSTALL "Generate installation target" ON)
 option(BUILD_SHARED_LIBS "Build shared libraries" ${UNIX})
 option(WITH_ZLIB "Search for the zlib compression library to support additional encodings" ON)
 option(WITH_LZO "Search for the LZO compression library to omit internal miniLZO implementation" ON)
@@ -671,19 +672,20 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libvncserver.pc.cmakein ${CMAKE_CURRE
 get_link_libraries(PRIVATE_LIBS vncclient)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libvncclient.pc.cmakein ${CMAKE_CURRENT_BINARY_DIR}/libvncclient.pc @ONLY)
 
-
-install_targets(/${CMAKE_INSTALL_LIBDIR} vncserver)
-install_targets(/${CMAKE_INSTALL_LIBDIR} vncclient)
-install_files(/include/rfb FILES
+if(LIBVNCSERVER_INSTALL)
+  install_targets(/${CMAKE_INSTALL_LIBDIR} vncserver)
+  install_targets(/${CMAKE_INSTALL_LIBDIR} vncclient)
+  install_files(/include/rfb FILES
     rfb/keysym.h
     rfb/rfb.h
     rfb/rfbclient.h
     rfb/rfbconfig.h
     rfb/rfbproto.h
     rfb/rfbregion.h
-)
+    )
 
-install_files(/${CMAKE_INSTALL_LIBDIR}/pkgconfig FILES
+  install_files(/${CMAKE_INSTALL_LIBDIR}/pkgconfig FILES
     libvncserver.pc
     libvncclient.pc
-)
+    )
+endif()

README.md

@@ -484,5 +484,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.dfdf
 Contact
 =======
 
-To contact me, mail me: Johannes dot Schindelin at gmx dot de
+* To file an issue, go to https://github.com/LibVNC/libvncserver/issues
+* For non-public contact mail dontmind at sdf dot org