diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-07-15 15:24:35 +0200 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2024-07-18 22:34:00 +0200 |
| commit | c12f669fc5050017d98ec57c8a45e575154a5edb (patch) | |
| tree | a735717a956aca535812b29d8d2fd4f80e72a851 /dep/g3dlite | |
| parent | 5e3a42ee8251ec0495ad42b57db728363bf7b844 (diff) | |
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 77fe2745febab9e4362b09750093d831325e6091)
Diffstat (limited to 'dep/g3dlite')
| -rw-r--r-- | dep/g3dlite/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/dep/g3dlite/CMakeLists.txt b/dep/g3dlite/CMakeLists.txt index 90d2280cc7b..fc22b4e10b8 100644 --- a/dep/g3dlite/CMakeLists.txt +++ b/dep/g3dlite/CMakeLists.txt @@ -60,6 +60,12 @@ target_include_directories(g3dlib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) +if((CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT NOJEM) OR TSAN) + target_compile_definitions(g3dlib + PRIVATE + NO_BUFFERPOOL) +endif() + target_link_libraries(g3dlib PRIVATE trinity-dependency-interface |