Split Simple-Web-Server dependency out from WebUI plugin

neilstephens · Aug 6, 2024 · 675c99f · 675c99f
1 parent 4c24885
commit 675c99f
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 40 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -354,6 +354,10 @@ if(LUAPORT OR LUATRANSFORM OR LUALOGSINK OR LUAUICOMMANDER)
 	message("add subdir LuaWrappers")
 	add_subdirectory(Code/Libs/LuaWrappers)
 endif()
+if(WEBUI)
+	message("add subdir SimpleWebServer")
+	add_subdirectory(Code/Libs/SimpleWebServer)
+endif()
 if(PYPORT OR SIMPORT)
 	message("add subdir HTTP")
 	add_subdirectory(Code/Libs/HTTP)

diff --git a/Code/Libs/SimpleWebServer/CMakeLists.txt b/Code/Libs/SimpleWebServer/CMakeLists.txt
@@ -0,0 +1,60 @@
+#	opendatacon
+ #
+ #	Copyright (c) 2020:
+ #
+ #		DCrip3fJguWgVCLrZFfA7sIGgvx1Ou3fHfCxnrz4svAi
+ #		yxeOtDhDCXf1Z4ApgXvX5ahqQmzRfJ2DoX8S05SqHA==
+ #	
+ #	Licensed under the Apache License, Version 2.0 (the "License");
+ #	you may not use this file except in compliance with the License.
+ #	You may obtain a copy of the License at
+ #	
+ #		http://www.apache.org/licenses/LICENSE-2.0
+ #
+ #	Unless required by applicable law or agreed to in writing, software
+ #	distributed under the License is distributed on an "AS IS" BASIS,
+ #	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ #	See the License for the specific language governing permissions and
+ #	limitations under the License.
+ # 
+ project(SimpleWebServer)
+
+# Locate Simple Web Server
+option(USE_SIMPLEWEB_SUBMODULE "Use git submodule to download Simple-Web-Server source" ON)
+set(SIMPLEWEB_HOME_INSTRUCTIONS "Choose the location of Simple-Web-Server source: there should be the main CMakeLists.txt within")
+
+set(SIMPLEWEB_SSL OFF CACHE BOOL "Build SSL client/server support in Simple-Web-Server (requires ODC_ASIO_SSL)")
+if(FULL)
+	set(SIMPLEWEB_SSL ON CACHE BOOL "Build SSL client/server support in Simple-Web-Server (requires ODC_ASIO_SSL)" FORCE)
+endif()
+if(SIMPLEWEB_SSL)
+	if(NOT ODC_ASIO_SSL)
+		message(FATAL_ERROR "SIMPLEWEB_SSL requires ODC_ASIO_SSL. Enable that option first")
+	endif()
+	add_definitions(-DUSE_HTTPS)
+endif()
+
+if(USE_SIMPLEWEB_SUBMODULE)
+	set(SIMPLEWEB_HOME "${CMAKE_SOURCE_DIR}/Code/submodules/Simple-Web-Server")
+	if(NOT EXISTS "${SIMPLEWEB_HOME}/.git")
+		execute_process(COMMAND git submodule update --init -- Code/submodules/Simple-Web-Server
+		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+	endif()
+else()
+	if(DEFINED SIMPLEWEB_HOME)
+		set(SIMPLEWEB_HOME ${SIMPLEWEB_HOME} CACHE PATH ${SIMPLEWEB_HOME_INSTRUCTIONS})
+	else()
+		set(SIMPLEWEB_HOME "/usr/local/src/Simple-Web-Server" CACHE PATH ${SIMPLEWEB_HOME_INSTRUCTIONS})
+	endif()
+endif()
+
+option(USE_OPENSSL "" SIMPLEWEB_SSL)
+option(USE_STANDALONE_ASIO "" ON)
+add_library(asio::asio ALIAS ODC)
+add_subdirectory(${SIMPLEWEB_HOME} Simple-Web-Server)
+#hide third party cmake options as advanced
+mark_as_advanced(FORCE Boost_INCLUDE_DIR)
+mark_as_advanced(FORCE BUILD_FUZZING)
+mark_as_advanced(FORCE BUILD_TESTING)
+mark_as_advanced(FORCE USE_OPENSSL)
+mark_as_advanced(FORCE USE_STANDALONE_ASIO)
diff --git a/Code/Plugins/WebUI/CMakeLists.txt b/Code/Plugins/WebUI/CMakeLists.txt
@@ -21,46 +21,6 @@ project(WebUI)
 
 file(GLOB ${PROJECT_NAME}_SRC *.cpp *.h *.def)
 
-# Locate Simple Web Server
-option(USE_SIMPLEWEB_SUBMODULE "Use git submodule to download Simple-Web-Server source" ON)
-set(SIMPLEWEB_HOME_INSTRUCTIONS "Choose the location of Simple-Web-Server source: there should be the main CMakeLists.txt within")
-
-set(SIMPLEWEB_SSL OFF CACHE BOOL "Build SSL client/server support in Simple-Web-Server (requires ODC_ASIO_SSL)")
-if(FULL)
-	set(SIMPLEWEB_SSL ON CACHE BOOL "Build SSL client/server support in Simple-Web-Server (requires ODC_ASIO_SSL)" FORCE)
-endif()
-if(SIMPLEWEB_SSL)
-	if(NOT ODC_ASIO_SSL)
-		message(FATAL_ERROR "SIMPLEWEB_SSL requires ODC_ASIO_SSL. Enable that option first")
-	endif()
-	add_definitions(-DUSE_HTTPS)
-endif()
-
-if(USE_SIMPLEWEB_SUBMODULE)
-	set(SIMPLEWEB_HOME "${CMAKE_SOURCE_DIR}/Code/submodules/Simple-Web-Server")
-	if(NOT EXISTS "${SIMPLEWEB_HOME}/.git")
-		execute_process(COMMAND git submodule update --init -- Code/submodules/Simple-Web-Server
-		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-	endif()
-else()
-	if(DEFINED SIMPLEWEB_HOME)
-		set(SIMPLEWEB_HOME ${SIMPLEWEB_HOME} CACHE PATH ${SIMPLEWEB_HOME_INSTRUCTIONS})
-	else()
-		set(SIMPLEWEB_HOME "/usr/local/src/Simple-Web-Server" CACHE PATH ${SIMPLEWEB_HOME_INSTRUCTIONS})
-	endif()
-endif()
-
-option(USE_OPENSSL "" SIMPLEWEB_SSL)
-option(USE_STANDALONE_ASIO "" ON)
-add_library(asio::asio ALIAS ODC)
-add_subdirectory(${SIMPLEWEB_HOME} Simple-Web-Server)
-#hide third party cmake options as advanced
-mark_as_advanced(FORCE Boost_INCLUDE_DIR)
-mark_as_advanced(FORCE BUILD_FUZZING)
-mark_as_advanced(FORCE BUILD_TESTING)
-mark_as_advanced(FORCE USE_OPENSSL)
-mark_as_advanced(FORCE USE_STANDALONE_ASIO)
-
 add_library(${PROJECT_NAME} MODULE ${${PROJECT_NAME}_SRC})
 target_link_libraries(${PROJECT_NAME} simple-web-server)