diff options
author | Naios <naios-dev@live.de> | 2017-11-28 22:05:25 +0100 |
---|---|---|
committer | Naios <naios-dev@live.de> | 2017-12-17 20:22:34 +0100 |
commit | 92f96fc10e70b2d62cce832837477d958e2afbe3 (patch) | |
tree | 316d60a95c09afc4ec51bda9341ff49f6f92336d /src | |
parent | e60c1f84a7e13577a82046b02b214f9466d20a7c (diff) |
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
Diffstat (limited to 'src')
-rw-r--r-- | src/common/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/common/PrecompiledHeaders/commonPCH.cpp | 18 | ||||
-rw-r--r-- | src/server/authserver/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/server/authserver/PrecompiledHeaders/authPCH.cpp | 18 | ||||
-rw-r--r-- | src/server/database/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/server/database/PrecompiledHeaders/databasePCH.cpp | 18 | ||||
-rw-r--r-- | src/server/game/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/server/game/PrecompiledHeaders/gamePCH.cpp | 18 | ||||
-rw-r--r-- | src/server/scripts/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/server/scripts/ScriptPCH.cpp | 19 | ||||
-rw-r--r-- | src/server/shared/CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/server/shared/PrecompiledHeaders/sharedPCH.cpp | 18 | ||||
-rw-r--r-- | src/server/worldserver/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/server/worldserver/PrecompiledHeaders/worldPCH.cpp | 18 |
14 files changed, 6 insertions, 161 deletions
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 <http://www.trinitycore.org/> - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#include "PrecompiledHeaders/commonPCH.h" diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index 206749b702f..5a9ad7c8314 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -25,10 +25,6 @@ endif() if (USE_COREPCH) set(PRIVATE_PCH_HEADER PrecompiledHeaders/authPCH.h) - set(PRIVATE_PCH_SOURCE PrecompiledHeaders/authPCH.cpp) - if (MSVC) - list(INSERT PRIVATE_SOURCES 0 PrecompiledHeaders/authPCH.cpp) - endif (MSVC) endif() GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) @@ -88,5 +84,5 @@ endif() # Generate precompiled header if (USE_COREPCH) - add_cxx_pch(authserver ${PRIVATE_PCH_HEADER} ${PRIVATE_PCH_SOURCE}) + add_cxx_pch(authserver ${PRIVATE_PCH_HEADER}) endif() diff --git a/src/server/authserver/PrecompiledHeaders/authPCH.cpp b/src/server/authserver/PrecompiledHeaders/authPCH.cpp deleted file mode 100644 index 76ee97ee0e7..00000000000 --- a/src/server/authserver/PrecompiledHeaders/authPCH.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/> - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#include "authPCH.h" diff --git a/src/server/database/CMakeLists.txt b/src/server/database/CMakeLists.txt index 0e8bd80c3b9..bcba7ead06c 100644 --- a/src/server/database/CMakeLists.txt +++ b/src/server/database/CMakeLists.txt @@ -16,10 +16,6 @@ CollectSourceFiles( if (USE_COREPCH) set(PRIVATE_PCH_HEADER PrecompiledHeaders/databasePCH.h) - set(PRIVATE_PCH_SOURCE PrecompiledHeaders/databasePCH.cpp) - if (MSVC) - list(INSERT PRIVATE_SOURCES 0 PrecompiledHeaders/databasePCH.cpp) - endif (MSVC) endif() GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) @@ -75,5 +71,5 @@ endif() # Generate precompiled header if (USE_COREPCH) - add_cxx_pch(database ${PRIVATE_PCH_HEADER} ${PRIVATE_PCH_SOURCE}) + add_cxx_pch(database ${PRIVATE_PCH_HEADER}) endif () diff --git a/src/server/database/PrecompiledHeaders/databasePCH.cpp b/src/server/database/PrecompiledHeaders/databasePCH.cpp deleted file mode 100644 index afc3186b656..00000000000 --- a/src/server/database/PrecompiledHeaders/databasePCH.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/> - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#include "databasePCH.h" diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 946cf96b312..901cd75a56a 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -16,10 +16,6 @@ CollectSourceFiles( if (USE_COREPCH) set(PRIVATE_PCH_HEADER PrecompiledHeaders/gamePCH.h) - set(PRIVATE_PCH_SOURCE PrecompiledHeaders/gamePCH.cpp) - if (MSVC) - list(INSERT PRIVATE_SOURCES 0 PrecompiledHeaders/gamePCH.cpp) - endif (MSVC) endif () GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) @@ -77,5 +73,5 @@ endif() # Generate precompiled header if (USE_COREPCH) - add_cxx_pch(game ${PRIVATE_PCH_HEADER} ${PRIVATE_PCH_SOURCE}) + add_cxx_pch(game ${PRIVATE_PCH_HEADER}) endif () diff --git a/src/server/game/PrecompiledHeaders/gamePCH.cpp b/src/server/game/PrecompiledHeaders/gamePCH.cpp deleted file mode 100644 index b073230fd25..00000000000 --- a/src/server/game/PrecompiledHeaders/gamePCH.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/> - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#include "gamePCH.h" diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index 3a241fcd95e..fdb19bfb440 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -91,10 +91,6 @@ endforeach() # Base sources which are used by every script project if (USE_SCRIPTPCH) set(PRIVATE_PCH_HEADER ScriptPCH.h) - set(PRIVATE_PCH_SOURCE ScriptPCH.cpp) - if (MSVC) - list(INSERT PRIVATE_SOURCES 0 ScriptPCH.cpp) - endif (MSVC) endif () GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) @@ -161,9 +157,6 @@ foreach(SCRIPT_MODULE ${SCRIPT_MODULE_LIST}) GetProjectNameOfScriptModule(${SCRIPT_MODULE} SCRIPT_MODULE_PROJECT_NAME) # Add the module name to DYNAMIC_SCRIPT_MODULES list(APPEND DYNAMIC_SCRIPT_MODULE_PROJECTS ${SCRIPT_MODULE_PROJECT_NAME}) - if (USE_SCRIPTPCH AND MSVC) - list(INSERT SCRIPT_MODULE_PRIVATE_SOURCES 0 ScriptPCH.cpp) - endif (USE_SCRIPTPCH AND MSVC) # Create the script module project add_library(${SCRIPT_MODULE_PROJECT_NAME} SHARED ${SCRIPT_MODULE_PRIVATE_SOURCES} diff --git a/src/server/scripts/ScriptPCH.cpp b/src/server/scripts/ScriptPCH.cpp deleted file mode 100644 index 25425276d24..00000000000 --- a/src/server/scripts/ScriptPCH.cpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/> - * Copyright (C) 2006-2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#include "ScriptPCH.h" diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index b6a9e526c47..400899ca749 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -16,7 +16,6 @@ CollectSourceFiles( if (USE_COREPCH) set(PRIVATE_PCH_HEADER PrecompiledHeaders/sharedPCH.h) - set(PRIVATE_PCH_SOURCE PrecompiledHeaders/sharedPCH.cpp) endif() GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) @@ -63,5 +62,5 @@ endif() # Generate precompiled header if (USE_COREPCH) - add_cxx_pch(shared ${PRIVATE_PCH_HEADER} ${PRIVATE_PCH_SOURCE}) + add_cxx_pch(shared ${PRIVATE_PCH_HEADER}) endif () diff --git a/src/server/shared/PrecompiledHeaders/sharedPCH.cpp b/src/server/shared/PrecompiledHeaders/sharedPCH.cpp deleted file mode 100644 index 3b045ac537a..00000000000 --- a/src/server/shared/PrecompiledHeaders/sharedPCH.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/> - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#include "sharedPCH.h" diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 94ab5e480f3..da3847cd566 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -23,10 +23,6 @@ endif() if (USE_COREPCH) set(PRIVATE_PCH_HEADER PrecompiledHeaders/worldPCH.h) - set(PRIVATE_PCH_SOURCE PrecompiledHeaders/worldPCH.cpp) - if (MSVC) - list(INSERT PRIVATE_SOURCES 0 PrecompiledHeaders/worldPCH.cpp) - endif (MSVC) endif() GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) @@ -100,5 +96,5 @@ endif() # Generate precompiled header if( USE_COREPCH ) - add_cxx_pch(worldserver ${PRIVATE_PCH_HEADER} ${PRIVATE_PCH_SOURCE}) + add_cxx_pch(worldserver ${PRIVATE_PCH_HEADER}) endif() diff --git a/src/server/worldserver/PrecompiledHeaders/worldPCH.cpp b/src/server/worldserver/PrecompiledHeaders/worldPCH.cpp deleted file mode 100644 index c0824b5423f..00000000000 --- a/src/server/worldserver/PrecompiledHeaders/worldPCH.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/> - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#include "worldPCH.h" |