CMake cleanup (#5082)

.github/workflows/build.yaml

@@ -39,7 +39,7 @@ jobs:
       - name: Configure
         run: |
           cmake -S . -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_C_COMPILER_LAUNCHER=ccache \
             -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
             -DEQEMU_BUILD_TESTS=ON \
@@ -69,7 +69,7 @@ jobs:
 
       - name: Enable long paths
         run: git config --global core.longpaths true
-        
+
       - name: Setup MSVC environment
         uses: TheMrMilchmann/setup-msvc-dev@v4
         with:
@@ -89,7 +89,7 @@ jobs:
         shell: pwsh
         run: |
           cmake -S . -B build -G "Visual Studio 17 2022" -A x64 `
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo `
+            -DCMAKE_BUILD_TYPE=Release `
             -DEQEMU_BUILD_TESTS=ON `
             -DEQEMU_BUILD_LOGIN=ON `
             -DEQEMU_BUILD_LUA=ON `
@@ -98,8 +98,8 @@ jobs:
 
       - name: Build
         shell: pwsh
-        run: cmake --build build --config RelWithDebInfo --target ALL_BUILD -- /m
+        run: cmake --build build --config Release --target ALL_BUILD -- /m
 
       - name: Test
         working-directory: build
-        run: ./bin/RelWithDebInfo/tests.exe
+        run: ./bin/Release/tests.exe

CMakeLists.txt

@@ -18,6 +18,17 @@ if(NOT CMAKE_TOOLCHAIN_FILE)
 	endif()
 endif()
 
+# Uncomment to generate just the standard Debug and Release configurations
+#set(CMAKE_BUILD_TYPE "Debug")
+#set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(dummy "${CMAKE_C_COMPILER}")
+
 project(EQEmu
 	VERSION 24.10.3
 	LANGUAGES CXX
@@ -27,34 +38,28 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 #explicitly set CMP0167 for Find Boost
 if(POLICY CMP0167)
-  cmake_policy(SET CMP0167 NEW)
+	cmake_policy(SET CMP0167 NEW)
 endif()
 
-if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
-	set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Build type")
-endif()
+option(EQEMU_BUILD_PCH "Build with precompiled headers" ON)
 
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-option(EQEMU_BUILD_PCH "Build with precompiled headers (Windows)" ON)
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
 
 if(MSVC)
-	add_compile_options(/bigobj)
-	add_compile_definitions(_CRT_SECURE_NO_WARNINGS NOMINMAX WIN32_LEAN_AND_MEAN CRASH_LOGGING)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+	# Always build with debug symbols
+	add_compile_options("$<$<CONFIG:RELEASE>:/Zi>")
+	add_link_options("$<$<CONFIG:RELEASE>:/DEBUG /OPT:REF /OPT:ICF>")
 
-	option(EQEMU_DISABLE_MSVC_WARNINGS "Disable MSVC compile warnings." OFF)
-	if(EQEMU_DISABLE_MSVC_WARNINGS)
-		add_compile_options(/W0 /wd4005 /wd4996 /nologo /Os)
-	endif()
+	add_compile_options(/bigobj /MP)
+	add_compile_definitions(_CRT_SECURE_NO_WARNINGS NOMINMAX WIN32_LEAN_AND_MEAN CRASH_LOGGING)
 
 	option(EQEMU_MSVC_DEBUG_CRT "Use the debug CRT on MSVC debug builds" OFF)
 	if(EQEMU_MSVC_DEBUG_CRT)
 		add_compile_definitions(_CRT_DBG_MAP_ALLOC)
 	endif()
 else()
+	add_compile_options("$<$<CONFIG:RELEASE>:-g>")
+
 	add_compile_definitions(HAS_UNION_SEMUN)
 endif()
 

CMakePresets.json

@@ -1,49 +1,74 @@
 {
-  "version": 3,
-  "cmakeMinimumRequired": {
-    "major": 3,
-    "minor": 19,
-    "patch": 0
-  },
-  "configurePresets": [
-    {
-      "name": "linux-debug",
-      "displayName": "Linux Debug",
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/build",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug",
-        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
-        "CMAKE_C_COMPILER_LAUNCHER": "ccache",
-        "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
-        "EQEMU_BUILD_LOGIN": "ON",
-        "EQEMU_BUILD_TESTS": "ON",
-        "EQEMU_ADD_PROFILER": "ON"
-      }
-    },
-    {
-      "name": "linux-release",
-      "displayName": "Linux Release",
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/build/release",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release",
-        "CMAKE_C_COMPILER_LAUNCHER": "ccache",
-        "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
-        "EQEMU_BUILD_LOGIN": "ON"
-      }
-    },
-  {
-      "name": "win-msvc",
-      "displayName": "Windows MSVC (VS 2022)",
-      "generator": "Visual Studio 17 2022",
-      "binaryDir": "${sourceDir}/build/${presetName}",
-      "architecture": { "value": "x64" },
-      "cacheVariables": {
-        "CMAKE_CONFIGURATION_TYPES": "Debug;Release",
-        "EQEMU_BUILD_LOGIN": "ON",
-        "EQEMU_BUILD_TESTS": "ON"
-      }
-    }
-  ]
-}
+	"version": 3,
+	"cmakeMinimumRequired": {
+		"major": 3,
+		"minor": 20,
+		"patch": 0
+	},
+	"configurePresets": [
+		{
+			"name": "linux",
+			"displayName": "Linux-Ninja",
+			"generator": "Ninja",
+			"binaryDir": "${sourceDir}/build",
+			"cacheVariables": {
+				"EQEMU_BUILD_TESTS": "ON"
+			}
+		},
+		{
+			"name": "linux-clang",
+			"displayName": "Linux-Ninja (Clang)",
+			"generator": "Ninja",
+			"binaryDir": "${sourceDir}/build",
+			"cacheVariables": {
+				"EQEMU_BUILD_TESTS": "ON",
+				"CMAKE_C_COMPILER": "clang",
+				"CMAKE_CXX_COMPILER": "clang++"
+			}
+		},
+		{
+			"name": "linux-ccache",
+			"displayName": "Linux-Ninja (Ccache)",
+			"generator": "Ninja",
+			"binaryDir": "${sourceDir}/build",
+			"cacheVariables": {
+				"CMAKE_C_COMPILER_LAUNCHER": "ccache",
+				"CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
+				"EQEMU_BUILD_TESTS": "ON"
+			}
+		},
+		{
+			"name": "linux-clang-ccache",
+			"displayName": "Linux-Ninja (Clang, Ccache)",
+			"generator": "Ninja",
+			"binaryDir": "${sourceDir}/build",
+			"cacheVariables": {
+				"CMAKE_C_COMPILER_LAUNCHER": "ccache",
+				"CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
+				"EQEMU_BUILD_TESTS": "ON",
+				"CMAKE_C_COMPILER": "clang",
+				"CMAKE_CXX_COMPILER": "clang++"
+			}
+		},
+		{
+			"name": "win-msvc-2022",
+			"displayName": "Windows MSVC (VS 2022)",
+			"generator": "Visual Studio 17 2022",
+			"binaryDir": "${sourceDir}/build",
+			"architecture": { "value": "x64" },
+			"cacheVariables": {
+				"EQEMU_BUILD_TESTS": "ON"
+			}
+		},
+		{
+			"name": "win-msvc-2026",
+			"displayName": "Windows MSVC (VS 2026)",
+			"generator": "Visual Studio 18 2026",
+			"binaryDir": "${sourceDir}/build",
+			"architecture": { "value": "x64" },
+			"cacheVariables": {
+				"EQEMU_BUILD_TESTS": "ON"
+			}
+		}
+	]
+}

client_files/CMakeLists.txt

@@ -1,4 +1,2 @@
-cmake_minimum_required(VERSION 3.20)
-
 add_subdirectory(import)
 add_subdirectory(export)

client_files/export/CMakeLists.txt

@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.20.0)
-
 set(export_sources
 	main.cpp
 )
@@ -12,7 +10,6 @@ add_executable(export_client_files ${export_sources} ${export_headers})
 install(TARGETS export_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
 target_link_libraries(export_client_files common)
-target_include_directories(export_client_files PRIVATE ../..)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set_property(TARGET export_client_files PROPERTY FOLDER executables/tools)

client_files/import/CMakeLists.txt

@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.20.0)
-
 set(import_sources
 	main.cpp
 )
@@ -12,7 +10,6 @@ add_executable(import_client_files ${import_sources} ${import_headers})
 install(TARGETS import_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
 target_link_libraries(import_client_files common)
-target_include_directories(import_client_files PRIVATE ../..)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set_property(TARGET import_client_files PROPERTY FOLDER executables/tools)

eqlaunch/CMakeLists.txt

@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.20)
-
 set(eqlaunch_sources
 	eqlaunch.cpp
 	worldserver.cpp
@@ -16,7 +14,6 @@ add_executable(eqlaunch ${eqlaunch_sources} ${eqlaunch_headers})
 install(TARGETS eqlaunch RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
 target_link_libraries(eqlaunch common)
-target_include_directories(eqlaunch PRIVATE ..)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set_property(TARGET eqlaunch PROPERTY FOLDER executables/tools)

libs/perlbind/CMakeLists.txt

@@ -3,58 +3,58 @@ cmake_minimum_required(VERSION 3.20.0)
 project(perlbind LANGUAGES CXX)
 
 set(PERLBIND_HEADERS
-  include/perlbind/array.h
-  include/perlbind/forward.h
-  include/perlbind/function.h
-  include/perlbind/hash.h
-  include/perlbind/interpreter.h
-  include/perlbind/iterator.h
-  include/perlbind/package.h
-  include/perlbind/perlbind.h
-  include/perlbind/scalar.h
-  include/perlbind/stack.h
-  include/perlbind/stack_push.h
-  include/perlbind/stack_read.h
-  include/perlbind/subcaller.h
-  include/perlbind/traits.h
-  include/perlbind/typemap.h
-  include/perlbind/types.h
-  include/perlbind/util.h
-  include/perlbind/version.h
+	include/perlbind/array.h
+	include/perlbind/forward.h
+	include/perlbind/function.h
+	include/perlbind/hash.h
+	include/perlbind/interpreter.h
+	include/perlbind/iterator.h
+	include/perlbind/package.h
+	include/perlbind/perlbind.h
+	include/perlbind/scalar.h
+	include/perlbind/stack.h
+	include/perlbind/stack_push.h
+	include/perlbind/stack_read.h
+	include/perlbind/subcaller.h
+	include/perlbind/traits.h
+	include/perlbind/typemap.h
+	include/perlbind/types.h
+	include/perlbind/util.h
+	include/perlbind/version.h
 )
 
 set(PERLBIND_SOURCES
-  src/function.cpp
-  src/hash.cpp
-  src/interpreter.cpp
-  src/package.cpp
+	src/function.cpp
+	src/hash.cpp
+	src/interpreter.cpp
+	src/package.cpp
 )
 
 if(MSVC)
-  set(PERLBIND_SOURCES ${PERLBIND_SOURCES} src/perlbind.natvis)
+	set(PERLBIND_SOURCES ${PERLBIND_SOURCES} src/perlbind.natvis)
 endif()
 
 add_library(perlbind ${PERLBIND_SOURCES} ${PERLBIND_HEADERS})
 
 target_include_directories(perlbind PUBLIC
-  ${PERL_INCLUDE_PATH}
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-  $<INSTALL_INTERFACE:include>)
+	${PERL_INCLUDE_PATH}
+	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+	$<INSTALL_INTERFACE:include>)
 
 option(PERLBIND_BUILD_TESTS "Build tests" OFF)
 option(PERLBIND_ENABLE_ASAN "Build with address sanitizer" OFF)
 
 if(PERLBIND_ENABLE_ASAN)
-  target_compile_options(perlbind PRIVATE -fsanitize=address -fno-omit-frame-pointer)
-  target_link_options(perlbind PRIVATE -fsanitize=address -fno-omit-frame-pointer)
+	target_compile_options(perlbind PRIVATE -fsanitize=address -fno-omit-frame-pointer)
+	target_link_options(perlbind PRIVATE -fsanitize=address -fno-omit-frame-pointer)
 endif()
 
 if(PERLBIND_BUILD_TESTS)
-  enable_testing()
-  add_subdirectory(test)
-  set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT tests)
+	enable_testing()
+	add_subdirectory(test)
+	set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT tests)
 
-  target_include_directories(tests PRIVATE
-    ${PERL_INCLUDE_PATH}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include)
+	target_include_directories(tests PRIVATE
+		${PERL_INCLUDE_PATH}
+		${CMAKE_CURRENT_SOURCE_DIR}/include)
 endif()

loginserver/CMakeLists.txt

@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.20)
-
 set(eqlogin_sources
 	account_management.cpp
 	client.cpp
@@ -33,17 +31,16 @@ add_executable(loginserver ${eqlogin_sources} ${eqlogin_headers})
 install(TARGETS loginserver RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
 target_link_libraries(loginserver common)
-target_include_directories(loginserver PRIVATE ..)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set_property(TARGET loginserver PROPERTY FOLDER executables/servers)
 
 # vcpkg doesn't copy legacy.dll automatically because it is loaded at runtime, not via the import table.
 if(WIN32 AND DEFINED VCPKG_INSTALLED_DIR AND DEFINED VCPKG_TARGET_TRIPLET)
-    add_custom_command(TARGET loginserver POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            "$<IF:$<CONFIG:Debug>,${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin/legacy.dll,${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin/legacy.dll>"
-            "$<TARGET_FILE_DIR:loginserver>/legacy.dll"
-        VERBATIM
-    )
+	add_custom_command(TARGET loginserver POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different
+			"$<IF:$<CONFIG:Debug>,${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin/legacy.dll,${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin/legacy.dll>"
+			"$<TARGET_FILE_DIR:loginserver>/legacy.dll"
+		VERBATIM
+	)
 endif()

queryserv/CMakeLists.txt

@@ -1,22 +1,20 @@
-cmake_minimum_required(VERSION 3.20)
-
 set(qserv_sources
-    database.cpp
-    lfguild.cpp
-    queryserv.cpp
-    queryservconfig.cpp
-    worldserver.cpp
-    zonelist.cpp
-    zoneserver.cpp
+	database.cpp
+	lfguild.cpp
+	queryserv.cpp
+	queryservconfig.cpp
+	worldserver.cpp
+	zonelist.cpp
+	zoneserver.cpp
 )
 
 set(qserv_headers
-    database.h
-    lfguild.h
-    queryservconfig.h
-    worldserver.h
-    zonelist.h
-    zoneserver.h
+	database.h
+	lfguild.h
+	queryservconfig.h
+	worldserver.h
+	zonelist.h
+	zoneserver.h
 )
 
 add_executable(queryserv ${qserv_sources} ${qserv_headers})
@@ -26,7 +24,6 @@ install(TARGETS queryserv RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 add_definitions(-DQSERV)
 
 target_link_libraries(queryserv common)
-target_include_directories(queryserv PRIVATE ..)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set_property(TARGET queryserv PROPERTY FOLDER executables/servers)

shared_memory/CMakeLists.txt

@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.17.0)
-
 set(shared_memory_sources
 	items.cpp
 	main.cpp
@@ -16,7 +14,6 @@ add_executable(shared_memory ${shared_memory_sources} ${shared_memory_headers})
 install(TARGETS shared_memory RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
 target_link_libraries(shared_memory common)
-target_include_directories(shared_memory PRIVATE ..)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set_property(TARGET shared_memory PROPERTY FOLDER executables/servers)

tests/CMakeLists.txt

@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.20.0)
-
 add_subdirectory(cppunit)
 
 set(tests_sources
@@ -22,7 +20,6 @@ set(tests_headers
 add_executable(tests ${tests_sources} ${tests_headers})
 
 target_link_libraries(tests common cppunit)
-target_include_directories(tests PRIVATE ..)
 
 install(TARGETS tests RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 

tests/cppunit/CMakeLists.txt

@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.20.0)
-
 set(cppunit_sources
 	collectoroutput.cpp
 	compileroutput.cpp

ucs/CMakeLists.txt

@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.20)
-
 set(ucs_sources
 	chatchannel.cpp
 	clientlist.cpp
@@ -24,7 +22,6 @@ install(TARGETS ucs RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 add_definitions(-DUCS)
 
 target_link_libraries(ucs common)
-target_include_directories(ucs PRIVATE ..)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set_property(TARGET ucs PROPERTY FOLDER executables/servers)

utils/deprecated/pfs_list/CMakeLists.txt

@@ -1,9 +1,7 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
 PROJECT(PFSUtil)
 
 IF(NOT CMAKE_BUILD_TYPE)
-    SET(CMAKE_BUILD_TYPE "Debug")
+	SET(CMAKE_BUILD_TYPE "Debug")
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
 IF(WIN32)

utils/deprecated/pfs_list/Common/CMakeLists.txt

@@ -1,15 +1,13 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
 SET(common_sources
-    Source/PFSArchive.cpp
-    Source/Compression.cpp
+	Source/PFSArchive.cpp
+	Source/Compression.cpp
 )
 
 SET(common_headers
-    Include/Archive.h
-    Include/PFSArchive.h
-    Include/PFSDataStructs.h
-    Include/Compression.h
+	Include/Archive.h
+	Include/PFSArchive.h
+	Include/PFSDataStructs.h
+	Include/Compression.h
 )
 
 INCLUDE_DIRECTORIES(Include)

utils/deprecated/pfs_list/PFSList/CMakeLists.txt

@@ -1,13 +1,11 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
 SET(pfslist_sources
-    Source/main.cpp
+	Source/main.cpp
 )
 
 SET(pfslist_headers
 )
 
-INCLUDE_DIRECTORIES(Include 
+INCLUDE_DIRECTORIES(Include
 	../Common/Include
 )
 
@@ -17,7 +15,7 @@ TARGET_LINK_LIBRARIES(PFSList Common ${ZLIB_LIBRARY} "Ws2_32.lib")
 
 IF(MSVC)
 	ADD_DEFINITIONS(/D _CONSOLE)
-    SET_TARGET_PROPERTIES(PFSList PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF")
+	SET_TARGET_PROPERTIES(PFSList PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF")
 ENDIF(MSVC)
 
 SET(EXECUTABLE_OUTPUT_PATH ../Build/PFSList)

utils/scripts/build/linux-build.sh

@@ -14,12 +14,12 @@ perl utils/scripts/build/tag-version.pl
 
 mkdir -p build && cd build && \
   cmake -DEQEMU_BUILD_TESTS=ON \
-      -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+      -DCMAKE_BUILD_TYPE=Release \
       -DEQEMU_BUILD_STATIC=ON \
       -DEQEMU_BUILD_LOGIN=ON \
       -DEQEMU_BUILD_LUA=ON \
       -DEQEMU_BUILD_PERL=ON \
-      -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-g -Wno-everything" \
+      -DCMAKE_CXX_FLAGS_RELEASE:STRING="-g -Wno-everything" \
       -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
       -G 'Unix Makefiles' \
       .. && make -j$((`nproc`-2))

world/CMakeLists.txt

@@ -1,92 +1,90 @@
-cmake_minimum_required(VERSION 3.20)
-
 set(world_sources
-    adventure.cpp
-    adventure_manager.cpp
-    cli/cli_bots_disable.cpp
-    cli/cli_bots_enable.cpp
-    cli/cli_copy_character.cpp
-    cli/cli_database_concurrency.cpp
-    cli/cli_database_dump.cpp
-    cli/cli_database_get_schema.cpp
-    cli/cli_database_set_account_status.cpp
-    cli/cli_database_updates.cpp
-    cli/cli_database_version.cpp
-    cli/cli_etl_get_settings.cpp
-    cli/cli_mercs_disable.cpp
-    cli/cli_mercs_enable.cpp
-    cli/cli_test.cpp
-    cli/cli_test_colors.cpp
-    cli/cli_test_expansion.cpp
-    cli/cli_test_repository.cpp
-    cli/cli_test_repository_2.cpp
-    cli/cli_test_string_benchmark.cpp
-    cli/cli_version.cpp
-    client.cpp
-    cliententry.cpp
-    clientlist.cpp
-    console.cpp
-    dynamic_zone.cpp
-    dynamic_zone_manager.cpp
-    eqemu_api_world_data_service.cpp
-    eql_config.cpp
-    launcher_link.cpp
-    launcher_list.cpp
-    lfplist.cpp
-    login_server.cpp
-    login_server_list.cpp
-    main.cpp
-    queryserv.cpp
-    shared_task_manager.cpp
-    shared_task_world_messaging.cpp
-    ucs.cpp
-    web_interface.cpp
-    web_interface_eqw.cpp
-    wguild_mgr.cpp
-    world_boot.cpp
-    world_config.cpp
-    world_console_connection.cpp
-    world_event_scheduler.cpp
-    world_server_cli.cpp
-    worlddb.cpp
-    zonelist.cpp
-    zoneserver.cpp
+	adventure.cpp
+	adventure_manager.cpp
+	cli/cli_bots_disable.cpp
+	cli/cli_bots_enable.cpp
+	cli/cli_copy_character.cpp
+	cli/cli_database_concurrency.cpp
+	cli/cli_database_dump.cpp
+	cli/cli_database_get_schema.cpp
+	cli/cli_database_set_account_status.cpp
+	cli/cli_database_updates.cpp
+	cli/cli_database_version.cpp
+	cli/cli_etl_get_settings.cpp
+	cli/cli_mercs_disable.cpp
+	cli/cli_mercs_enable.cpp
+	cli/cli_test.cpp
+	cli/cli_test_colors.cpp
+	cli/cli_test_expansion.cpp
+	cli/cli_test_repository.cpp
+	cli/cli_test_repository_2.cpp
+	cli/cli_test_string_benchmark.cpp
+	cli/cli_version.cpp
+	client.cpp
+	cliententry.cpp
+	clientlist.cpp
+	console.cpp
+	dynamic_zone.cpp
+	dynamic_zone_manager.cpp
+	eqemu_api_world_data_service.cpp
+	eql_config.cpp
+	launcher_link.cpp
+	launcher_list.cpp
+	lfplist.cpp
+	login_server.cpp
+	login_server_list.cpp
+	main.cpp
+	queryserv.cpp
+	shared_task_manager.cpp
+	shared_task_world_messaging.cpp
+	ucs.cpp
+	web_interface.cpp
+	web_interface_eqw.cpp
+	wguild_mgr.cpp
+	world_boot.cpp
+	world_config.cpp
+	world_console_connection.cpp
+	world_event_scheduler.cpp
+	world_server_cli.cpp
+	worlddb.cpp
+	zonelist.cpp
+	zoneserver.cpp
 )
 
 set(world_headers
-    adventure.h
-    adventure_manager.h
-    adventure_template.h
-    client.h
-    cliententry.h
-    clientlist.h
-    console.h
-    dynamic_zone.h
-    dynamic_zone_manager.h
-    eqemu_api_world_data_service.h
-    eql_config.h
-    launcher_link.h
-    launcher_list.h
-    lfplist.h
-    login_server.h
-    login_server_list.h
-    queryserv.h
-    shared_task_manager.h
-    shared_task_world_messaging.h
-    sof_char_create_data.h
-    ucs.h
-    web_interface.h
-    web_interface_eqw.h
-    wguild_mgr.h
-    world_boot.h
-    world_config.h
-    world_console_connection.h
-    world_event_scheduler.h
-    world_server_cli.h
-    world_tcp_connection.h
-    worlddb.h
-    zonelist.h
-    zoneserver.h
+	adventure.h
+	adventure_manager.h
+	adventure_template.h
+	client.h
+	cliententry.h
+	clientlist.h
+	console.h
+	dynamic_zone.h
+	dynamic_zone_manager.h
+	eqemu_api_world_data_service.h
+	eql_config.h
+	launcher_link.h
+	launcher_list.h
+	lfplist.h
+	login_server.h
+	login_server_list.h
+	queryserv.h
+	shared_task_manager.h
+	shared_task_world_messaging.h
+	sof_char_create_data.h
+	ucs.h
+	web_interface.h
+	web_interface_eqw.h
+	wguild_mgr.h
+	world_boot.h
+	world_config.h
+	world_console_connection.h
+	world_event_scheduler.h
+	world_server_cli.h
+	world_tcp_connection.h
+	worlddb.h
+	zonelist.h
+	zoneserver.h
 )
 
 source_group("cli" REGULAR_EXPRESSION "cli/.*")
@@ -96,10 +94,9 @@ add_executable(world ${world_sources} ${world_headers})
 target_compile_definitions(world PRIVATE WORLD)
 
 target_link_libraries(world common)
-target_include_directories(world PRIVATE ..)
 
-if(WIN32 AND EQEMU_BUILD_PCH)
-    target_precompile_headers(world PRIVATE ../common/pch/std-pch.h)
+if(EQEMU_BUILD_PCH)
+	target_precompile_headers(world PRIVATE ../common/pch/std-pch.h)
 endif()
 
 install(TARGETS world RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)