diff options
| author | Spp <spp@jorge.gr> | 2012-11-09 16:09:27 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-11-09 16:09:27 +0100 |
| commit | a57254d769afdeac52a06ac605f6e9d8fe189a7e (patch) | |
| tree | 698ef9b8b7c9a813a78113a31139098c972ec861 | |
| parent | 333b8e5159ada2f1b8cbfd1dd8eb9072754477d7 (diff) | |
Core/Build: Fix problem with acelite
| -rw-r--r-- | dep/acelite/6.1.4_tc_changes.diff | 17 | ||||
| -rw-r--r-- | dep/acelite/ace/CMakeLists.txt | 15 |
2 files changed, 27 insertions, 5 deletions
diff --git a/dep/acelite/6.1.4_tc_changes.diff b/dep/acelite/6.1.4_tc_changes.diff index a0caff7ab7d..6f1a5c2f3bf 100644 --- a/dep/acelite/6.1.4_tc_changes.diff +++ b/dep/acelite/6.1.4_tc_changes.diff @@ -3,7 +3,7 @@ new file mode 100644 index 0000000..acd3d5a --- /dev/null +++ b/dep/acelite/ace/CMakeLists.txt -@@ -0,0 +1,337 @@ +@@ -0,0 +1,348 @@ +# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/> +# +# This file is free software; as a special exception the author gives @@ -325,6 +325,11 @@ index 0000000..acd3d5a + XTI_ATM_Mcast.cpp +) + ++if (USE_COREPCH) ++ set(ace_PCH_HDR PrecompiledHeaders/WinAcePCH.h) ++ set(ace_PCH_SRC PrecompiledHeaders/WinAcePCH.cpp) ++endif() ++ +include_directories( + ${CMAKE_SOURCE_DIR}/dep/acelite + ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders @@ -336,9 +341,15 @@ index 0000000..acd3d5a + +add_definitions(-DACE_BUILD_DLL) + -+add_library(ace SHARED ${ace_STAT_SRCS}) ++add_library(ace SHARED ++ ${ace_STAT_SRCS} ++ ${ace_PCH_SRC} ++) + -+add_native_precompiled_header(ace ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders/WinAcePCH) ++# Generate precompiled header ++if( USE_COREPCH ) ++ add_cxx_pch(ace ${ace_PCH_HDR} ${ace_PCH_SRC}) ++endif() + +install(TARGETS ace RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}") diff --git a/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp b/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp diff --git a/dep/acelite/ace/CMakeLists.txt b/dep/acelite/ace/CMakeLists.txt index a0a590e0c30..f22bc381202 100644 --- a/dep/acelite/ace/CMakeLists.txt +++ b/dep/acelite/ace/CMakeLists.txt @@ -320,6 +320,11 @@ set(ace_STAT_SRCS XTI_ATM_Mcast.cpp ) +if (USE_COREPCH) + set(ace_PCH_HDR PrecompiledHeaders/WinAcePCH.h) + set(ace_PCH_SRC PrecompiledHeaders/WinAcePCH.cpp) +endif() + include_directories( ${CMAKE_SOURCE_DIR}/dep/acelite ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders @@ -331,8 +336,14 @@ set_source_files_properties(Atomic_Op_Sparc.c Rtems_init.c PROPERTIES LANGUAGE C add_definitions(-DACE_BUILD_DLL) -add_library(ace SHARED ${ace_STAT_SRCS}) +add_library(ace SHARED + ${ace_STAT_SRCS} + ${ace_PCH_SRC} +) -add_native_precompiled_header(ace ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders/WinAcePCH) +# Generate precompiled header +if( USE_COREPCH ) + add_cxx_pch(ace ${ace_PCH_HDR} ${ace_PCH_SRC}) +endif() install(TARGETS ace RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}") |