Merge branch 'develop' into LuaWebPort

; Conflicts: ; Code/Libs/SimpleWebServer/CMakeLists.txt
neilstephens · Sep 6, 2024 · 414298b · 414298b
2 parents 47e8b8a + 2a634ea
commit 414298b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Code/Libs/SimpleWebServer/CMakeLists.txt b/Code/Libs/SimpleWebServer/CMakeLists.txt
@@ -31,7 +31,6 @@ 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)
@@ -60,3 +59,6 @@ mark_as_advanced(FORCE USE_OPENSSL)
 mark_as_advanced(FORCE USE_STANDALONE_ASIO)
 
 target_include_directories(simple-web-server INTERFACE include)
+if(SIMPLEWEB_SSL)
+	target_compile_definitions(simple-web-server INTERFACE USE_HTTPS)
+endif()