Make sure that just one instance of controls is created with static l…

…ibraries
rdkcentral · Jan 15, 2025 · f4b8345 · f4b8345
1 parent 36b0b53
commit f4b8345
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/Source/Thunder/CMakeLists.txt b/Source/Thunder/CMakeLists.txt
@@ -66,7 +66,6 @@ target_link_libraries(${TARGET}
           ${NAMESPACE}Cryptalgo::${NAMESPACE}Cryptalgo
           ${NAMESPACE}COM::${NAMESPACE}COM
           ${NAMESPACE}Messaging::${NAMESPACE}Messaging
-          ${NAMESPACE}Assertion::${NAMESPACE}Assertion
           ${NAMESPACE}WebSocket::${NAMESPACE}WebSocket
           ${NAMESPACE}Plugins::${NAMESPACE}Plugins
           ${NAMESPACE}COMProcess::${NAMESPACE}COMProcess  # For COM executable define

diff --git a/Source/com/Communicator.cpp b/Source/com/Communicator.cpp
@@ -555,13 +555,15 @@ namespace RPC {
         if (announceMessage->Response().IsSet() == true) {
             string jsonMessagingCategories(announceMessage->Response().MessagingCategories());
 
+#ifdef BUILD_SHARED_LIBS
             Assertion::AssertionUnit::Instance();
 
-#if defined(WARNING_REPORTING_ENABLED)
+    #if defined(WARNING_REPORTING_ENABLED)
             string jsonDefaultWarningCategories(announceMessage->Response().WarningReportingCategories());
             if(jsonDefaultWarningCategories.empty() == false){
                 WarningReporting::WarningReportingUnit::Instance().Defaults(jsonDefaultWarningCategories);
             }
+    #endif
 #endif
             _connectionId = announceMessage->Response().SequenceNumber();
 

diff --git a/Source/com/Communicator.h b/Source/com/Communicator.h
@@ -35,12 +35,6 @@
 #include <processcontainers/processcontainers.h>
 #endif
 
-// #include <assertion/AssertionUnit.h>
-
-#if defined(WARNING_REPORTING_ENABLED)
-#include <warningreporting/WarningReportingUnit.h>
-#endif
-
 #include "IteratorType.h"
 
 namespace Thunder {

diff --git a/Source/com/Module.h b/Source/com/Module.h
@@ -25,10 +25,13 @@
 
 #include <core/core.h>
 #include <messaging/messaging.h>
-#include <assertion/assertion.h>
 
-#ifdef __CORE_WARNING_REPORTING__
-#include <warningreporting/warningreporting.h>
+#ifdef BUILD_SHARED_LIBS
+    #include <assertion/assertion.h>
+
+    #ifdef __CORE_WARNING_REPORTING__
+        #include <warningreporting/warningreporting.h>
+    #endif
 #endif
 
 #if defined(__WINDOWS__) && defined(COM_EXPORTS)