From beff80f0e795aac7d431676abf450ca66f849c6e Mon Sep 17 00:00:00 2001
From: NadeemYaseen <70559777+NadeemYaseen@users.noreply.github.com>
Date: Wed, 6 Mar 2024 16:21:19 +0500
Subject: [PATCH] rename nlohmann_json target to foedag_nlohmann_json to avoid
 name clash (#661)

---
 CMakeLists.txt                     | 2 +-
 FOEDAG                             | 2 +-
 src/ConfigurationRS/CMakeLists.txt | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c3b63344..8fc7c14b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -203,7 +203,7 @@ target_link_libraries(raptor_gui PUBLIC rs_licenseManager)
 	endif()
 endif()
 
-add_dependencies(raptor_gui nlohmann_json)
+add_dependencies(raptor_gui foedag_nlohmann_json)
 add_dependencies(raptor_gui scope_guard)
 add_dependencies(raptor_gui cfgcommonrs)
 
diff --git a/FOEDAG b/FOEDAG
index 4366cb586..f1385b756 160000
--- a/FOEDAG
+++ b/FOEDAG
@@ -1 +1 @@
-Subproject commit 4366cb5860a344806eacdca9b907843b626744ef
+Subproject commit f1385b756818494d3171205502797120ccdbb565
diff --git a/src/ConfigurationRS/CMakeLists.txt b/src/ConfigurationRS/CMakeLists.txt
index 39a3b8c5a..2731d1c80 100644
--- a/src/ConfigurationRS/CMakeLists.txt
+++ b/src/ConfigurationRS/CMakeLists.txt
@@ -158,6 +158,6 @@ target_link_libraries(bitgenerator INTERFACE cfgobject)
 target_link_libraries(bitassembler INTERFACE bitgenerator)
 target_link_libraries(ocla INTERFACE hardwaremanager)
 
-add_dependencies(bitassembler nlohmann_json)
-add_dependencies(bitgenerator nlohmann_json)
-add_dependencies(cfgcrypto openssl_build)
\ No newline at end of file
+add_dependencies(bitassembler foedag_nlohmann_json)
+add_dependencies(bitgenerator foedag_nlohmann_json)
+add_dependencies(cfgcrypto openssl_build)