Fix cmake & metrics names

disintar · Dec 17, 2024 · 9f13eab · 9f13eab
1 parent 61f33d2
commit 9f13eab
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/crypto/vm/cells/ExtCell.h b/crypto/vm/cells/ExtCell.h
@@ -76,7 +76,7 @@ class ExtCell : public Cell {
   }
 
   static td::NamedThreadSafeCounter::CounterRef get_thread_safe_counter_unloaded() {
-    static auto res = td::NamedThreadSafeCounter::get_default().get_counter("ExtCell.unloaded");
+    static auto res = td::NamedThreadSafeCounter::get_default().get_counter("ExtCell_unloaded");
     return res;
   }
 

diff --git a/validator/CMakeLists.txt b/validator/CMakeLists.txt
@@ -4,6 +4,13 @@ if (NOT OPENSSL_FOUND)
   find_package(OpenSSL REQUIRED)
 endif()
 
+if (NIX)
+  find_package(PkgConfig REQUIRED)
+  pkg_check_modules(MHD REQUIRED libmicrohttpd)
+else()
+  find_package(MHD REQUIRED)
+endif()
+
 #add_subdirectory(dummy0)
 add_subdirectory(impl)
 
@@ -211,10 +218,15 @@ target_include_directories(full-node PUBLIC
   ${OPENSSL_INCLUDE_DIR}
   )
 
-target_link_libraries(validator PRIVATE tdactor adnl rldp tl_api dht tdfec overlay catchain validatorsession ton_db)
+target_include_directories(full-node PUBLIC ${MHD_INCLUDE_DIR} ${MHD_STATIC_INCLUDE_DIRS})
+target_include_directories(validator-hardfork PUBLIC ${MHD_INCLUDE_DIR} ${MHD_STATIC_INCLUDE_DIRS})
+target_include_directories(validator-disk PUBLIC ${MHD_INCLUDE_DIR} ${MHD_STATIC_INCLUDE_DIRS})
+target_include_directories(validator PUBLIC ${MHD_INCLUDE_DIR} ${MHD_STATIC_INCLUDE_DIRS})
+
+target_link_libraries(validator PRIVATE ${MHD_LIBRARY} ${MHD_STATIC_LIBRARIES} tdactor adnl rldp tl_api dht tdfec overlay catchain validatorsession ton_db)
 
-target_link_libraries(validator-disk PRIVATE ton_validator tdutils tdactor adnl rldp tl_api dht tdfec overlay catchain validatorsession ton_db)
+target_link_libraries(validator-disk PRIVATE ${MHD_LIBRARY} ${MHD_STATIC_LIBRARIES} ton_validator tdutils tdactor adnl rldp tl_api dht tdfec overlay catchain validatorsession ton_db)
 
-target_link_libraries(validator-hardfork PRIVATE tdactor adnl rldp tl_api dht tdfec overlay catchain validatorsession ton_db)
+target_link_libraries(validator-hardfork PRIVATE ${MHD_LIBRARY} ${MHD_STATIC_LIBRARIES} tdactor adnl rldp tl_api dht tdfec overlay catchain validatorsession ton_db)
 
-target_link_libraries(full-node PRIVATE tdactor adnl rldp rldp2 tl_api dht tdfec overlay catchain validatorsession ton_db)
+target_link_libraries(full-node PRIVATE ${MHD_LIBRARY} ${MHD_STATIC_LIBRARIES} tdactor adnl rldp rldp2 tl_api dht tdfec overlay catchain validatorsession ton_db)
diff --git a/validator/impl/CMakeLists.txt b/validator/impl/CMakeLists.txt
@@ -4,6 +4,13 @@ if (NOT OPENSSL_FOUND)
   find_package(OpenSSL REQUIRED)
 endif()
 
+if (NIX)
+  find_package(PkgConfig REQUIRED)
+  pkg_check_modules(MHD REQUIRED libmicrohttpd)
+else()
+  find_package(MHD REQUIRED)
+endif()
+
 set(TON_VALIDATOR_SOURCE
   accept-block.cpp
   block.cpp
@@ -47,11 +54,12 @@ set(TON_VALIDATOR_SOURCE
 
 add_library(ton_validator STATIC ${TON_VALIDATOR_SOURCE})
 
+target_include_directories(ton_validator PUBLIC ${MHD_INCLUDE_DIR} ${MHD_STATIC_INCLUDE_DIRS})
 target_include_directories(ton_validator PUBLIC 
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> 
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/.. 
   ${OPENSSL_INCLUDE_DIR}
 )
 
-target_link_libraries(ton_validator PRIVATE tdutils tdactor adnl tl_api tl_lite_api tl-lite-utils dht tdfec
+target_link_libraries(ton_validator PRIVATE ${MHD_LIBRARY} ${MHD_STATIC_LIBRARIES} tdutils tdactor adnl tl_api tl_lite_api tl-lite-utils dht tdfec
   overlay catchain validatorsession ton_crypto ton_block)