rename nlohmann_json target to foedag_nlohmann_json to avoid name cla…

…sh (#661)
os-fpga · Mar 6, 2024 · beff80f · beff80f
1 parent 89448c5
commit beff80f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
diff --git 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)
+add_dependencies(bitassembler foedag_nlohmann_json)
+add_dependencies(bitgenerator foedag_nlohmann_json)
+add_dependencies(cfgcrypto openssl_build)