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

10 files changed, 37 insertions, 30 deletions

diff --git a/dep/CascLib/CMakeLists.txt b/dep/CascLib/CMakeLists.txt
index e27710ffe18..b1a1e90b5e6 100644
--- a/dep/CascLib/CMakeLists.txt
+++ b/dep/CascLib/CMakeLists.txt
@@ -59,7 +59,7 @@ target_include_directories(casc
     PRIVATE
       ${CMAKE_SOURCE_DIR}/dep)
 
-target_compile_definitions(casc PUBLIC -D__SYS_ZLIB -DCASCLIB_NO_AUTO_LINK_LIBRARY -DCASCLIB_NODEBUG)
+target_compile_definitions(casc PUBLIC __SYS_ZLIB CASCLIB_NO_AUTO_LINK_LIBRARY CASCLIB_NODEBUG)
 
 target_link_libraries(casc
   PRIVATE
diff --git a/dep/SFMT/CMakeLists.txt b/dep/SFMT/CMakeLists.txt
index 117fae8ba4c..700118e9b5f 100644
--- a/dep/SFMT/CMakeLists.txt
+++ b/dep/SFMT/CMakeLists.txt
@@ -36,7 +36,7 @@ target_include_directories(sfmt
     ${CMAKE_CURRENT_SOURCE_DIR})
 
 # using the standard Mersenne exponent 19937
-target_compile_definitions(sfmt PUBLIC -DSFMT_MEXP=19937)
+target_compile_definitions(sfmt PUBLIC SFMT_MEXP=19937)
 
 # enable SIMD instructions if available
 include(CheckCXXCompilerFlag)
@@ -67,11 +67,11 @@ else ()
 endif ()
 
 if (HAVE_NEON)
-  target_compile_definitions(sfmt PUBLIC -DHAVE_NEON)
+  target_compile_definitions(sfmt PUBLIC HAVE_NEON)
 endif ()
 
 if (HAVE_SSE2)
-  target_compile_definitions(sfmt PUBLIC -DHAVE_SSE2)
+  target_compile_definitions(sfmt PUBLIC HAVE_SSE2)
 endif ()
 
 set_target_properties(sfmt PROPERTIES LINKER_LANGUAGE CXX)
diff --git a/dep/argon2/CMakeLists.txt b/dep/argon2/CMakeLists.txt
index f503afaa6d9..7b9a993e2a2 100644
--- a/dep/argon2/CMakeLists.txt
+++ b/dep/argon2/CMakeLists.txt
@@ -23,7 +23,7 @@ add_library(argon2 STATIC
 
 target_compile_definitions(argon2
   PRIVATE
-    -DARGON2_NO_THREADS)
+    ARGON2_NO_THREADS)
 
 set_target_properties(argon2 PROPERTIES LINKER_LANGUAGE CXX)
 
diff --git a/dep/boost/CMakeLists.txt b/dep/boost/CMakeLists.txt
index 4bf2c3feaa7..b374a88989e 100644
--- a/dep/boost/CMakeLists.txt
+++ b/dep/boost/CMakeLists.txt
@@ -20,8 +20,6 @@ endif()
 
 set(Boost_NO_WARN_NEW_VERSIONS ON)
 
-include (CheckCXXSourceCompiles)
-
 if (WIN32)
   # On windows the requirements are higher according to the wiki.
   set(BOOST_REQUIRED_VERSION 1.78)
@@ -49,19 +47,24 @@ target_include_directories(boost
 
 target_compile_definitions(boost
   INTERFACE
-    -DBOOST_ALL_NO_LIB
-    -DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE
-    -DBOOST_ASIO_NO_DEPRECATED
-    -DBOOST_BIND_NO_PLACEHOLDERS
-    -DBOOST_SYSTEM_USE_UTF8)
+    BOOST_ALL_NO_LIB
+    BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE
+    BOOST_ASIO_NO_DEPRECATED
+    BOOST_BIND_NO_PLACEHOLDERS
+    BOOST_SYSTEM_USE_UTF8)
 
 if (WITH_BOOST_STACKTRACE AND NOT WIN32)
-  message("*** libbacktrace will be linked")
+  message(STATUS "libbacktrace will be linked")
+
+  include(CheckIncludeFile)
 
   if (BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE)
-    CHECK_INCLUDE_FILE(${BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE} HAS_BACKTRACE)
+    check_include_file("${BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE}" HAS_BACKTRACE)
+    target_compile_definitions(boost
+      INTERFACE
+        BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE=${BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE})
   else()
-    CHECK_INCLUDE_FILE("backtrace.h" HAS_BACKTRACE)
+    check_include_file("backtrace.h" HAS_BACKTRACE)
   endif()
 
   if (NOT HAS_BACKTRACE)
@@ -70,7 +73,7 @@ if (WITH_BOOST_STACKTRACE AND NOT WIN32)
 
   target_compile_definitions(boost
     INTERFACE
-      -DBOOST_STACKTRACE_USE_BACKTRACE)
+      BOOST_STACKTRACE_USE_BACKTRACE)
 
   target_link_libraries(boost
     INTERFACE
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
diff --git a/dep/gsoap/CMakeLists.txt b/dep/gsoap/CMakeLists.txt
index cd5bc0ad085..77fb50d1e87 100644
--- a/dep/gsoap/CMakeLists.txt
+++ b/dep/gsoap/CMakeLists.txt
@@ -20,7 +20,7 @@ target_include_directories(gsoap
 
 target_compile_definitions(gsoap
   PUBLIC
-    -DWITH_OPENSSL)
+    WITH_OPENSSL)
 
 target_link_libraries(gsoap
   PRIVATE
@@ -37,5 +37,5 @@ if (MSVC)
   # Little fix for MSVC / Windows platforms
   target_compile_definitions(gsoap
     PRIVATE
-      -D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=0)
+      _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=0)
 endif()
diff --git a/dep/jemalloc/CMakeLists.txt b/dep/jemalloc/CMakeLists.txt
index 42bc5fd51e4..48e7c36d9de 100644
--- a/dep/jemalloc/CMakeLists.txt
+++ b/dep/jemalloc/CMakeLists.txt
@@ -91,11 +91,9 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT NOJEM)
       ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
   target_compile_definitions(jemalloc
-    PUBLIC
-      -DNO_BUFFERPOOL
     PRIVATE
-      -D_GNU_SOURCE
-      -D_REENTRAN)
+      _GNU_SOURCE
+      _REENTRAN)
 
   target_link_libraries(jemalloc
     PRIVATE
diff --git a/dep/openssl_ed25519/CMakeLists.txt b/dep/openssl_ed25519/CMakeLists.txt
index eddfb1c20c4..946aaaf7f3b 100644
--- a/dep/openssl_ed25519/CMakeLists.txt
+++ b/dep/openssl_ed25519/CMakeLists.txt
@@ -25,7 +25,7 @@ target_include_directories(openssl_ed25519
 
 target_compile_definitions(openssl_ed25519
   PRIVATE
-    -DOPENSSL_ED25519_EXPORT
+    OPENSSL_ED25519_EXPORT
 )
 
 target_link_libraries(openssl_ed25519
diff --git a/dep/protobuf/CMakeLists.txt b/dep/protobuf/CMakeLists.txt
index c1c29ce6578..c1465b73c7f 100644
--- a/dep/protobuf/CMakeLists.txt
+++ b/dep/protobuf/CMakeLists.txt
@@ -74,10 +74,10 @@ target_link_libraries(protobuf
 if (BUILD_SHARED_LIBS)
   target_compile_definitions(protobuf
     PRIVATE
-      -DLIBPROTOBUF_EXPORTS
-      -DLIBPROTOC_EXPORTS
+      LIBPROTOBUF_EXPORTS
+      LIBPROTOC_EXPORTS
     PUBLIC
-      -DPROTOBUF_USE_DLLS)
+      PROTOBUF_USE_DLLS)
 endif()
 
 if (MSVC)
@@ -87,7 +87,7 @@ if (MSVC)
 
   target_compile_definitions(protobuf
     PRIVATE
-      -D_SCL_SECURE_NO_WARNINGS)
+      _SCL_SECURE_NO_WARNINGS)
 endif()
 
 set_target_properties(protobuf
diff --git a/dep/rapidjson/CMakeLists.txt b/dep/rapidjson/CMakeLists.txt
index 58c4d48f09a..6ec34b9b083 100644
--- a/dep/rapidjson/CMakeLists.txt
+++ b/dep/rapidjson/CMakeLists.txt
@@ -16,9 +16,9 @@ target_include_directories(rapidjson
 
 target_compile_definitions(rapidjson
   INTERFACE
-    -DRAPIDJSON_HAS_STDSTRING
-    -DRAPIDJSON_48BITPOINTER_OPTIMIZATION=0
-    -DRAPIDJSON_ASSERT=WPAssert)
+    RAPIDJSON_HAS_STDSTRING
+    RAPIDJSON_48BITPOINTER_OPTIMIZATION=0
+    RAPIDJSON_ASSERT=WPAssert)
 
 if(TRINITY_SYSTEM_PROCESSOR MATCHES "x86|amd64")
   target_compile_definitions(rapidjson INTERFACE -DRAPIDJSON_SSE2)