mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-30 13:47:23 +01:00
Build: CMake cleanup
* Migrate all add_definitions to target_compile_definitions
* Remove -D from preprocessor definitions added by target_compile_definitions (unneccessary, cmake strips it anyway)
* Fixed NO_BUFFERPOOL not being set on g3d if jemalloc is used
* Moved library/compiler specific compile flag settings spread all over various CMakeLists to their related library/compiler file
* Remove ancient manual link flag settings for worldserver
(cherry picked from commit 77fe2745fe)
This commit is contained in:
@@ -24,15 +24,6 @@ add_library(database
|
||||
${PRIVATE_SOURCES}
|
||||
)
|
||||
|
||||
# Do NOT add any extra include directory unless it does not create unneeded extra dependencies,
|
||||
# and specially, not add any dependency to neither of these: shared, game, scripts
|
||||
# This way we ensure that if either a PR does that without modifying this file,
|
||||
# a compile error will be generated, either this file will be modified so it
|
||||
# is detected more easily.
|
||||
# While it is OK to include files from other libs as long as they don't require
|
||||
# linkage (enums, defines...) it is discouraged to do so unless necessary, as it will pullute
|
||||
# include_directories leading to further unnoticed dependency aditions
|
||||
# Linker Depencency requirements: common
|
||||
CollectIncludeDirectories(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
PUBLIC_INCLUDES
|
||||
@@ -45,7 +36,9 @@ target_include_directories(database
|
||||
PRIVATE
|
||||
${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
add_definitions(-DTRINITY_API_EXPORT_DATABASE)
|
||||
target_compile_definitions(database
|
||||
PRIVATE
|
||||
TRINITY_API_EXPORT_DATABASE)
|
||||
|
||||
target_link_libraries(database
|
||||
PRIVATE
|
||||
|
||||
Reference in New Issue
Block a user