Merge branch 'main' into joelsmith/joelsmith/fix-address-type

tenstorrent · Nov 26, 2024 · b2bdd5c · b2bdd5c
2 parents 1901ee8 + db8a0d5
commit b2bdd5c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -56,6 +56,7 @@ function(fetch_dependencies)
         GITHUB_REPOSITORY nanomsg/nng
         GIT_TAG v1.8.0
         OPTIONS
+            "BUILD_SHARED_LIBS ON"
             "NNG_TESTS OFF"
             "NNG_TOOLS OFF"
     )
@@ -96,14 +97,7 @@ function(fetch_dependencies)
     ############################################################################################################################
     # libuv (for process management)
     ############################################################################################################################
-    CPMAddPackage(
-        NAME libuv
-        GITHUB_REPOSITORY libuv/libuv
-        GIT_TAG v1.48.0
-        OPTIONS
-            "LIBUV_BUILD_TESTS OFF"
-            "LIBUV_BUILD_SHARED OFF"
-    )
+    CPMAddPackage(NAME libuv GITHUB_REPOSITORY libuv/libuv GIT_TAG v1.48.0 OPTIONS "LIBUV_BUILD_TESTS OFF")
 
     ############################################################################################################################
     # fmt : https://github.com/fmtlib/fmt

diff --git a/device/CMakeLists.txt b/device/CMakeLists.txt
@@ -41,15 +41,16 @@ target_include_directories(
 )
 
 # flatbuffers is public - exposed to tt_metal by tt_simulation_device_generated.h
+# nng is public - exposed to tt_metal by tt_simulation_host.hpp
 target_link_libraries(
     device
     PUBLIC
+        nng
         flatbuffers
+        uv
     PRIVATE
         hwloc
-        nng
         rt
-        uv_a
         Boost::interprocess
         fmt::fmt-header-only
         yaml-cpp::yaml-cpp

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -13,7 +13,6 @@ target_link_libraries(
         gtest
         pthread
         fmt::fmt-header-only
-        nng
 )
 target_include_directories(
     test_common
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,6 @@ target_link_libraries( @@
             gtest
             pthread
             fmt::fmt-header-only
-            nng
     )
     target_include_directories(
         test_common
@@ Expand Down @@