Move gSOAP into a diffrent folder

vmangos · Aug 26, 2024 · 7934be2 · 7934be2
1 parent 64189a2
commit 7934be2
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 18 deletions.
diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt
@@ -17,6 +17,7 @@
 
 add_subdirectory(src)
 add_subdirectory(recastnavigation)
+add_subdirectory(gsoap)
 if (USE_EXTRACTORS)
 	add_subdirectory(libmpq)
 endif()
diff --git a/dep/src/gsoap/CMakeLists.txt → dep/gsoap/CMakeLists.txt b/dep/src/gsoap/CMakeLists.txt → dep/gsoap/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
-# Copyright (C) 2009-2011 MaNGOSZero <https://github.com/mangos/zero>
-#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -15,19 +12,20 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-set (gsoap_SRCS 
+set(gsoap_SRCS
+	stdsoap2.h
 	stdsoap2.cpp
-
+	soapC.cpp
+	soapH.h
+	soapStub.h
+	soapServer.cpp
 )
 
+add_library(gsoap STATIC ${gsoap_SRCS})
 
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/dep/include/gsoap
-)
+set_target_properties(gsoap PROPERTIES LINKER_LANGUAGE CXX)
 
-add_library(gsoap STATIC
-  ${gsoap_SRCS}
-)
+target_include_directories(gsoap PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(gsoap PUBLIC ${OPENSSL_LIBRARIES})
+SET_TARGET_PROPERTIES (gsoap PROPERTIES FOLDER "dep")
 
-SET_TARGET_PROPERTIES (gsoap PROPERTIES FOLDER "3rd Party")
diff --git a/src/mangosd/remote/soap/soapC.cpp → dep/gsoap/soapC.cpp b/src/mangosd/remote/soap/soapC.cpp → dep/gsoap/soapC.cpp
diff --git a/src/mangosd/remote/soap/soapH.h → dep/gsoap/soapH.h b/src/mangosd/remote/soap/soapH.h → dep/gsoap/soapH.h
diff --git a/src/mangosd/remote/soap/soapServer.cpp → dep/gsoap/soapServer.cpp b/src/mangosd/remote/soap/soapServer.cpp → dep/gsoap/soapServer.cpp
diff --git a/src/mangosd/remote/soap/soapStub.h → dep/gsoap/soapStub.h b/src/mangosd/remote/soap/soapStub.h → dep/gsoap/soapStub.h
diff --git a/dep/src/gsoap/stdsoap2.cpp → dep/gsoap/stdsoap2.cpp b/dep/src/gsoap/stdsoap2.cpp → dep/gsoap/stdsoap2.cpp
diff --git a/dep/include/gsoap/stdsoap2.h → dep/gsoap/stdsoap2.h b/dep/include/gsoap/stdsoap2.h → dep/gsoap/stdsoap2.h
diff --git a/dep/src/CMakeLists.txt b/dep/src/CMakeLists.txt
@@ -20,7 +20,6 @@ if (MINGW)
 add_subdirectory(libseh)
 endif()
 add_subdirectory(g3dlite)
-add_subdirectory(gsoap)
 if(WIN32)
     add_subdirectory(zlib)
 endif()
diff --git a/src/mangosd/CMakeLists.txt b/src/mangosd/CMakeLists.txt
@@ -26,10 +26,6 @@ set(EXECUTABLE_SRCS
   WorldRunnable.cpp
   remote/RemoteAccess/RASocket.h
   remote/RemoteAccess/RASocket.cpp
-  remote/soap/soapH.h
-  remote/soap/soapC.cpp
-  remote/soap/soapStub.h
-  remote/soap/soapServer.cpp
   remote/soap/MaNGOSsoap.h
   remote/soap/MaNGOSsoap.cpp
 )