rename nlohmann_json target to foedag_nlohmann_json to avoid name clash

os-fpga · Mar 6, 2024 · 0dee507 · 0dee507
1 parent 4366cb5
commit 0dee507
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -311,24 +311,24 @@ configure_file(foedag_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/foedag_ve
 
 # Explicit lib build order
 add_dependencies(foedag foedagcore)
-add_dependencies(compiler nlohmann_json)
+add_dependencies(compiler foedag_nlohmann_json)
 add_dependencies(compiler tcl_stubb_build)
 add_dependencies(simulation tcl_stubb_build)
 add_dependencies(ipgenerate tcl_stubb_build)
 add_dependencies(designquery tcl_stubb_build)
-add_dependencies(designquery nlohmann_json)
+add_dependencies(designquery foedag_nlohmann_json)
 add_dependencies(devicemodeling tcl_stubb_build)
-add_dependencies(devicemodeling nlohmann_json)
-add_dependencies(projnavigator nlohmann_json)
-add_dependencies(newproject nlohmann_json)
+add_dependencies(devicemodeling foedag_nlohmann_json)
+add_dependencies(projnavigator foedag_nlohmann_json)
+add_dependencies(newproject foedag_nlohmann_json)
 add_dependencies(foedagcore tcl_stubb_build)
 add_dependencies(console tcl_stubb_build)
 add_dependencies(console tcl_static)
 add_dependencies(newproject tcl_stubb_build)
 add_dependencies(tcl_stubb_build tcl_build)
 add_dependencies(console QConsole)
 add_dependencies(tclutils tcl_stubb_build)
-add_dependencies(newproject nlohmann_json)
+add_dependencies(newproject foedag_nlohmann_json)
 if(MSVC)
 else()
   add_dependencies(tcl_build zlib_build)

diff --git a/src/Configuration/CMakeLists.txt b/src/Configuration/CMakeLists.txt
@@ -123,4 +123,4 @@ endforeach()
 #  This is custom dependencies within configuration subsystem
 add_dependencies(cfgcompiler tcl_stubb_build)
 add_dependencies(programmer tcl_stubb_build)
-add_dependencies(modelconfig nlohmann_json)
+add_dependencies(modelconfig foedag_nlohmann_json)
diff --git a/third_party/nlohmann_json/CMakeLists.txt b/third_party/nlohmann_json/CMakeLists.txt
@@ -12,7 +12,7 @@ set (SRC_H_LIST
     json.hpp
 )
 
-add_custom_target(nlohmann_json DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/../../include/nlohmann_json/json.hpp)
+add_custom_target(foedag_nlohmann_json DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/../../include/nlohmann_json/json.hpp)
 
 add_custom_command(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/../../include/nlohmann_json/json.hpp