From 92f96fc10e70b2d62cce832837477d958e2afbe3 Mon Sep 17 00:00:00 2001 From: Naios Date: Tue, 28 Nov 2017 22:05:25 +0100 Subject: Build: Use the cotire library for precompiled header handling * Required for handling flags inherited by linked projects correctly in the corresponding precompiled header. * Reduces the maintenance effort for precompiled headers --- src/common/CMakeLists.txt | 6 +----- src/common/PrecompiledHeaders/commonPCH.cpp | 18 ------------------ 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 src/common/PrecompiledHeaders/commonPCH.cpp (limited to 'src/common') diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index c219e89626d..7440cc2d51e 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -25,10 +25,6 @@ list(APPEND PRIVATE_SOURCES if (USE_COREPCH) set(PRIVATE_PCH_HEADER PrecompiledHeaders/commonPCH.h) - set(PRIVATE_PCH_SOURCE PrecompiledHeaders/commonPCH.cpp) - if (MSVC) - list(INSERT PRIVATE_SOURCES 0 PrecompiledHeaders/commonPCH.cpp) - endif (MSVC) endif (USE_COREPCH) GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) @@ -99,5 +95,5 @@ endif() # Generate precompiled header if (USE_COREPCH) - add_cxx_pch(common ${PRIVATE_PCH_HEADER} ${PRIVATE_PCH_SOURCE}) + add_cxx_pch(common ${PRIVATE_PCH_HEADER}) endif () diff --git a/src/common/PrecompiledHeaders/commonPCH.cpp b/src/common/PrecompiledHeaders/commonPCH.cpp deleted file mode 100644 index eccfda05b32..00000000000 --- a/src/common/PrecompiledHeaders/commonPCH.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (C) 2008-2017 TrinityCore - * - * 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 (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include "PrecompiledHeaders/commonPCH.h" -- cgit v1.2.3