adapt to the recent changes in Thunder master branch

rdkcentral · Jun 18, 2024 · bbb4c75 · bbb4c75
1 parent ce9f068
commit bbb4c75
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 1 deletion.
diff --git a/PersistentStore/CMakeLists.txt b/PersistentStore/CMakeLists.txt
@@ -19,6 +19,12 @@ cmake_minimum_required(VERSION 3.14)
 
 set(PLUGIN_NAME PersistentStore)
 find_package(WPEFramework)
+if (NOT WPEFramework_FOUND)
+    find_package(Thunder)
+    if (Thunder_FOUND)
+        add_compile_definitions(WITH_THUNDER_NAMESPACE)
+    endif ()
+endif ()
 set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
 
 set(CMAKE_CXX_STANDARD 11)

diff --git a/PersistentStore/PersistentStore.cpp b/PersistentStore/PersistentStore.cpp
@@ -31,7 +31,11 @@ namespace WPEFramework {
 
 namespace {
 
+#ifdef WITH_THUNDER_NAMESPACE
+    static Thunder::Plugin::Metadata<Plugin::PersistentStore> metadata(
+#else
     static Plugin::Metadata<Plugin::PersistentStore> metadata(
+#endif
         // Version (Major, Minor, Patch)
         API_VERSION_NUMBER_MAJOR, API_VERSION_NUMBER_MINOR, API_VERSION_NUMBER_PATCH,
         // Preconditions

diff --git a/PersistentStore/grpc/l0test/CMakeLists.txt b/PersistentStore/grpc/l0test/CMakeLists.txt
@@ -35,6 +35,12 @@ FetchContent_MakeAvailable(googletest)
 target_link_libraries(${PROJECT_NAME} PRIVATE gmock_main)
 
 find_package(WPEFramework)
+if (NOT WPEFramework_FOUND)
+    find_package(Thunder)
+    if (Thunder_FOUND)
+        add_compile_definitions(WITH_THUNDER_NAMESPACE)
+    endif ()
+endif ()
 find_package(${NAMESPACE}Plugins REQUIRED)
 target_link_libraries(${PROJECT_NAME} PRIVATE ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
 

diff --git a/PersistentStore/l0test/CMakeLists.txt b/PersistentStore/l0test/CMakeLists.txt
@@ -29,6 +29,12 @@ FetchContent_Declare(
 FetchContent_MakeAvailable(googletest)
 
 find_package(WPEFramework)
+if (NOT WPEFramework_FOUND)
+    find_package(Thunder)
+    if (Thunder_FOUND)
+        add_compile_definitions(WITH_THUNDER_NAMESPACE)
+    endif ()
+endif ()
 find_package(${NAMESPACE}Plugins REQUIRED)
 find_package(${NAMESPACE}Definitions REQUIRED)
 

diff --git a/PersistentStore/l1test/CMakeLists.txt b/PersistentStore/l1test/CMakeLists.txt
@@ -29,6 +29,12 @@ FetchContent_Declare(
 FetchContent_MakeAvailable(googletest)
 
 find_package(WPEFramework)
+if (NOT WPEFramework_FOUND)
+    find_package(Thunder)
+    if (Thunder_FOUND)
+        add_compile_definitions(WITH_THUNDER_NAMESPACE)
+    endif ()
+endif ()
 find_package(${NAMESPACE}Plugins REQUIRED)
 find_package(${NAMESPACE}Definitions REQUIRED)
 

diff --git a/PersistentStore/sqlite/l1test/CMakeLists.txt b/PersistentStore/sqlite/l1test/CMakeLists.txt
@@ -28,7 +28,13 @@ FetchContent_Declare(
 )
 FetchContent_MakeAvailable(googletest)
 
-find_package(WPEFramework REQUIRED)
+find_package(WPEFramework)
+if (NOT WPEFramework_FOUND)
+    find_package(Thunder)
+    if (Thunder_FOUND)
+        add_compile_definitions(WITH_THUNDER_NAMESPACE)
+    endif ()
+endif ()
 find_package(${NAMESPACE}Plugins REQUIRED)
 
 add_executable(${PROJECT_NAME}