summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
Diffstat (limited to 'src/server')
-rw-r--r--src/server/CMakeLists.txt3
-rw-r--r--src/server/apps/CMakeLists.txt5
2 files changed, 1 insertions, 7 deletions
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 559745d0a7..b5ed464a21 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -12,8 +12,7 @@
add_subdirectory(apps)
-# if ((APPS_BUILD AND NOT APPS_BUILD STREQUAL "none") OR BUILD_TOOLS_DB_IMPORT) # DB import PR
-if ((APPS_BUILD AND NOT APPS_BUILD STREQUAL "none"))
+if ((APPS_BUILD AND NOT APPS_BUILD STREQUAL "none") OR BUILD_TOOLS_DB_IMPORT)
add_subdirectory(database)
endif()
diff --git a/src/server/apps/CMakeLists.txt b/src/server/apps/CMakeLists.txt
index 807c89efc3..d30ff6dd1b 100644
--- a/src/server/apps/CMakeLists.txt
+++ b/src/server/apps/CMakeLists.txt
@@ -56,11 +56,6 @@ foreach(BUILD_APP ${APPLICATIONS_BUILD_LIST})
set(BUILD_APP_VALUE_DISPLAY_apps apps)
list(APPEND BUILD_APP_VALUE_CONTAINS_apps ${BUILD_APP})
- if (${BUILD_APP} MATCHES "authserver")
- set (BUILD_APPLICATION_AUTHSERVER 1)
- elseif(${BUILD_APP} MATCHES "worldserver")
- set (BUILD_APPLICATION_WORLDSERVER 1)
- endif()
else()
list(APPEND BUILD_APP_GRAPH_KEYS disabled)
set(BUILD_APP_VALUE_DISPLAY_disabled disabled)