From b03cc7529385a58aa0c9cfd45f1b743088a27a16 Mon Sep 17 00:00:00 2001 From: sanctum32 Date: Wed, 4 Feb 2015 11:37:27 +0000 Subject: [PATCH] Removed soap options from cmake build There is already option to enable or disable it in configs This feature should come with full mangos package --- src/mangosd/CMakeLists.txt | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/mangosd/CMakeLists.txt b/src/mangosd/CMakeLists.txt index 7548216ae..256ae5596 100644 --- a/src/mangosd/CMakeLists.txt +++ b/src/mangosd/CMakeLists.txt @@ -26,25 +26,21 @@ set(EXECUTABLE_SRCS RASocket.h WorldRunnable.cpp WorldRunnable.h + MaNGOSsoap.cpp + MaNGOSsoap.h + soapC.cpp + soapH.h + soapServer.cpp + soapStub.h ) -if(SOAP) - LIST(APPEND EXECUTABLE_SRCS - MaNGOSsoap.cpp - MaNGOSsoap.h - soapC.cpp - soapH.h - soapServer.cpp - soapStub.h - ) -endif() - if(WIN32) # add resource file to windows build set(EXECUTABLE_SRCS ${EXECUTABLE_SRCS} mangosd.rc) endif() include_directories( + ${CMAKE_SOURCE_DIR}/dep/include/gsoap ${CMAKE_SOURCE_DIR}/src/shared ${CMAKE_SOURCE_DIR}/src/framework ${CMAKE_SOURCE_DIR}/src/game/ @@ -75,10 +71,6 @@ if(SCRIPT_LIB_SD2) include_directories(${CMAKE_SOURCE_DIR}/src/modules/SD2) endif() -if(SOAP) - include_directories(${CMAKE_SOURCE_DIR}/dep/include/gsoap) -endif() - if(POSTGRESQL) include_directories(${PGSQL_INCLUDE_DIR}) else()