Update cmake some more. (ultravnc#208)

* cmake: Update librdr.

* cmake: Update libomnithread.

* cmake: Update libudt4.

* cmake: Update libudtcloud.

* cmake: Update libzip32.

* cmake: Update libzipunzip.

* cmake: Update repeater.

* cmake: Update vncviewer.

* cmake: Update winvnc.

* cmake: Update uvnc_settings.

* cmake: Update main CMakeLists.txt.

* cmake: Remove unneeded libuvncsettings.

* cmake: Add createpassword.

* cmake: Add testauth.

* cmake: Add uvnckeyboardhelper.

* cmake: Add MSLogonACL.

* cmake: Add vnchooks.

* cmake: Add logging.

* cmake: Add logmessages.

* cmake: Add authadmin.

* cmake: Add authSSP.

* cmake: Add ldapauth.

* cmake: Add ldapauth9x.

* cmake: Add ldapauthnt4.

* cmake: Add workgrpdomnt4.

* cmake: Add setcad.

* cmake: Add setpasswd.

* cmake: Add SecureVNCPlugin (disabled).

* cmake: Add option to compile with Address Santitizer.

* cmake: Copy mingw runtime dlls to the install directory.

* cmake: Update readme.txt.

	modified:   cmake/CMakeLists.txt
	deleted:    cmake/libuvncsettings/CMakeLists.txt

cmake/CMakeLists.txt

@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.5.0)
 project(UltraVNC LANGUAGES C CXX RC)
 
 set(CMAKE_CXX_STANDARD 14)
-<<<<<<< HEAD
 if (MINGW)
     set(CMAKE_C_FLAGS "-Wno-write-strings")
     set(CMAKE_CXX_FLAGS "-Wno-write-strings -Wno-conversion-null")
@@ -36,16 +35,10 @@ add_subdirectory(createpassword)
 add_subdirectory(ldapauth)
 add_subdirectory(ldapauth9x)
 add_subdirectory(ldapauthnt4)
-=======
-set(CMAKE_C_FLAGS "-Wno-write-strings")
-set(CMAKE_CXX_FLAGS "-Wno-write-strings -Wno-conversion-null")
-
->>>>>>> 0e6f1f7b (Catch up with the cmake files the recent changes to the VC project files. (#206))
 add_subdirectory(libomnithread)
 add_subdirectory(librdr)
 add_subdirectory(libudt4)
 add_subdirectory(libudtcloud)
-<<<<<<< HEAD
 add_subdirectory(libzip32)
 add_subdirectory(libzipunzip)
 add_subdirectory(logging)
@@ -59,13 +52,6 @@ add_subdirectory(testauth)
 add_subdirectory(uvnc_settings)
 add_subdirectory(uvnckeyboardhelper)
 add_subdirectory(vnchooks)
-=======
-add_subdirectory(libuvncsettings)
-add_subdirectory(libzip32)
-add_subdirectory(libzipunzip)
-add_subdirectory(repeater)
-add_subdirectory(uvnc_settings)
->>>>>>> 0e6f1f7b (Catch up with the cmake files the recent changes to the VC project files. (#206))
 add_subdirectory(vncviewer)
 add_subdirectory(winvnc)
 add_subdirectory(workgrpdomnt4)