Catch up with the cmake files the recent changes to the VC project fi…

…les. (ultravnc#206) * cmake: Reflect recent changes for omnithread. * cmake: Reflect recent changes for rdr. * cmake: Reflect recent changes for udt4. * cmake: Reflect recent changes for udtcloud. * cmake: Reflect recent changes for uvncsettings. * cmake: Reflect recent changes for zip32. * cmake: Reflect recent changes for zipunzip. * cmake: Reflect recent changes for uvnc_settings. * cmake: Reflect recent changes for vncviewer. * cmake: Reflect recent changes for winvnc. * cmake: Remove remainings from before the switch to VCPKG. * cmake: Add repeater. * cmake: Update readme.txt. modified: cmake/CMakeLists.txt modified: cmake/libomnithread/CMakeLists.txt modified: cmake/librdr/CMakeLists.txt modified: cmake/libudtcloud/CMakeLists.txt new file: cmake/libuvncsettings/CMakeLists.txt modified: cmake/libzip32/CMakeLists.txt modified: cmake/libzipunzip/CMakeLists.txt modified: cmake/readme.txt modified: cmake/repeater/CMakeLists.txt
jose94752 · Oct 15, 2024 · 9060d0a · 9060d0a
1 parent dc2b03b
commit 9060d0a
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 8 deletions.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -3,6 +3,7 @@ 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")
@@ -35,10 +36,16 @@ 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)
@@ -52,6 +59,13 @@ 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)
diff --git a/cmake/libomnithread/CMakeLists.txt b/cmake/libomnithread/CMakeLists.txt
@@ -8,4 +8,4 @@ add_library(${PROJECT_NAME} STATIC)
 foreach(file ${${PROJECT_NAME}_SOURCES})
     target_sources(${PROJECT_NAME} PRIVATE "${CMAKE_SOURCE_DIR}/../omnithread/${file}")
 endforeach(file)
-target_compile_definitions(${PROJECT_NAME} PRIVATE NDEBUG WIN32 _WINDOWS __NT__ _WINSTATIC __WIN32__ _WIN32_WINNT=0x400)
+target_compile_definitions(${PROJECT_NAME} PRIVATE NDEBUG WIN32 _WINDOWS __NT__ _WINSTATIC __WIN32__ _WIN32_WINNT=0x400)
diff --git a/cmake/librdr/CMakeLists.txt b/cmake/librdr/CMakeLists.txt
@@ -26,4 +26,4 @@ target_link_libraries(${PROJECT_NAME}
     PRIVATE ZLIB::ZLIB
     PRIVATE zstd::libzstd
     PRIVATE LibLZMA::LibLZMA
-)
+)
diff --git a/cmake/libudtcloud/CMakeLists.txt b/cmake/libudtcloud/CMakeLists.txt
@@ -14,4 +14,4 @@ foreach(file ${${PROJECT_NAME}_SOURCES})
 endforeach(file)
 target_link_libraries(${PROJECT_NAME}
     libudt4
-)
+)
diff --git a/cmake/libuvncsettings/CMakeLists.txt b/cmake/libuvncsettings/CMakeLists.txt
@@ -0,0 +1,18 @@
+
+set(LIBUVNCSETTINGS_SOURCES
+    capture.cpp
+    connections.cpp
+    filetransfer.cpp
+    firewall.cpp
+    log.cpp
+    misc.cpp
+    network.cpp
+    security.cpp
+    service.cpp
+)
+add_library(libuvncsettings STATIC)
+target_include_directories(libuvncsettings PRIVATE "${CMAKE_SOURCE_DIR}/../DSMPlugin")
+target_include_directories(libuvncsettings PRIVATE "${CMAKE_SOURCE_DIR}/../omnithread")
+foreach(file ${LIBUVNCSETTINGS_SOURCES})
+    target_sources(libuvncsettings PRIVATE "${CMAKE_SOURCE_DIR}/../uvnc_settings/uvnc_settings/${file}")
+endforeach(file)
diff --git a/cmake/libzip32/CMakeLists.txt b/cmake/libzip32/CMakeLists.txt
@@ -21,4 +21,4 @@ add_library(${PROJECT_NAME} STATIC)
 foreach(file ${${PROJECT_NAME}_SOURCES})
     target_sources(${PROJECT_NAME} PRIVATE "${CMAKE_SOURCE_DIR}/../zipunzip_src/zip20/${file}")
 endforeach(file)
-target_compile_definitions(${PROJECT_NAME} PRIVATE NDEBUG _WINDOWS WIN32 NO_ASM WINDLL MSDOS USE_ZIPMAIN ZIPLIB)
+target_compile_definitions(${PROJECT_NAME} PRIVATE NDEBUG _WINDOWS WIN32 NO_ASM WINDLL MSDOS USE_ZIPMAIN ZIPLIB)
diff --git a/cmake/libzipunzip/CMakeLists.txt b/cmake/libzipunzip/CMakeLists.txt
@@ -24,4 +24,4 @@ add_library(${PROJECT_NAME} STATIC)
 foreach(file ${${PROJECT_NAME}_SOURCES})
     target_sources(${PROJECT_NAME} PRIVATE "${CMAKE_SOURCE_DIR}/../zipunzip_src/unzip/${file}")
 endforeach(file)
-target_compile_definitions(${PROJECT_NAME} PRIVATE NDEBUG _WINDOWS WIN32 WINDLL DLL UNZIPLIB USE_EF_UT_TIME)
+target_compile_definitions(${PROJECT_NAME} PRIVATE NDEBUG _WINDOWS WIN32 WINDLL DLL UNZIPLIB USE_EF_UT_TIME)
diff --git a/cmake/readme.txt b/cmake/readme.txt
@@ -172,5 +172,4 @@ set CL=/MP
 
 cd /d C:\source\UltraVNC
 msbuild %_P% winvnc\winvnc.sln
-msbuild %_P% vncviewer\vncviewer.sln
-
+msbuild %_P% vncviewer\vncviewer.sln
diff --git a/cmake/repeater/CMakeLists.txt b/cmake/repeater/CMakeLists.txt
@@ -31,4 +31,4 @@ target_link_libraries(${PROJECT_NAME}
 install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_BINARY_DIR}/ultravnc)
 if (MSVC)
     install(FILES $<TARGET_PDB_FILE:${PROJECT_NAME}> DESTINATION ${CMAKE_BINARY_DIR}/ultravnc OPTIONAL)
-endif()
+endif()
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,4 @@ foreach(file ${${PROJECT_NAME}_SOURCES}) @@
     endforeach(file)
     target_link_libraries(${PROJECT_NAME}
         libudt4
-    )
+    )