From 702cfefddbc1a8a83e113cec44ee09ecc9daf6db Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 5 Apr 2016 17:55:32 +0200 Subject: Buildsystem: Initial changes to support building with vs clang toolset (cherry picked from commit 4a3a178d7fe9d2d7e8fde2fe915cf5cec5223502) --- src/common/CMakeLists.txt | 2 +- src/server/authserver/CMakeLists.txt | 2 +- src/server/database/CMakeLists.txt | 2 +- src/server/game/CMakeLists.txt | 2 +- src/server/scripts/CMakeLists.txt | 2 +- src/server/shared/CMakeLists.txt | 2 +- src/server/worldserver/CMakeLists.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 4250df6d1f1..436620e2900 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -33,8 +33,8 @@ GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) add_definitions(-DTRINITY_API_EXPORT_COMMON) add_library(common - ${PRIVATE_SOURCES} ${PRIVATE_PCH_SOURCE} + ${PRIVATE_SOURCES} ) # Do NOT add any extra include directory here, as we don't want the common diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index 1d40129ec1b..d1f0e4460e9 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -31,8 +31,8 @@ endif() GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) add_executable(authserver - ${PRIVATE_SOURCES} ${PRIVATE_PCH_SOURCE} + ${PRIVATE_SOURCES} ) if( NOT WIN32 ) diff --git a/src/server/database/CMakeLists.txt b/src/server/database/CMakeLists.txt index 06772cd5309..236586075ee 100644 --- a/src/server/database/CMakeLists.txt +++ b/src/server/database/CMakeLists.txt @@ -22,8 +22,8 @@ endif() GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) add_library(database - ${PRIVATE_SOURCES} ${PRIVATE_PCH_SOURCE} + ${PRIVATE_SOURCES} ) # Do NOT add any extra include directory unless it does not create unneeded extra dependencies, diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index df0d2b7cc2a..60e86093f89 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -24,8 +24,8 @@ GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) add_definitions(-DTRINITY_API_EXPORT_GAME) add_library(game - ${PRIVATE_SOURCES} ${PRIVATE_PCH_SOURCE} + ${PRIVATE_SOURCES} ) CollectIncludeDirectories( diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index d12c44c447c..8c0adc4c1e1 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -51,8 +51,8 @@ endif () GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) add_library(scripts STATIC - ${PRIVATE_SOURCES} ${PRIVATE_PCH_SOURCE} + ${PRIVATE_SOURCES} ) target_include_directories(scripts diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index 1ab340a4f3e..e99a81a084b 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -24,8 +24,8 @@ GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) add_definitions(-DTRINITY_API_EXPORT_SHARED) add_library(shared - ${PRIVATE_SOURCES} ${PRIVATE_PCH_SOURCE} + ${PRIVATE_SOURCES} ) CollectIncludeDirectories( diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 7fb4c6d2b75..7923b239854 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -29,8 +29,8 @@ endif() GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) add_executable(worldserver - ${PRIVATE_SOURCES} ${PRIVATE_PCH_SOURCE} + ${PRIVATE_SOURCES} ) if( NOT WIN32 ) -- cgit v1.2.3