Bump dependencies

Signed-off-by: Alexander Krimm <A.Krimm@gsi.de>
fair-acc · Dec 10, 2024 · 0fced61 · 0fced61
1 parent 749394c
commit 0fced61
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 25 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,7 @@ set(ENABLE_TESTING OFF)
 FetchContent_Declare(
   gnuradio4
   GIT_REPOSITORY https://github.com/fair-acc/gnuradio4.git
-  GIT_TAG 5e7ecc561dfb35a6a8fd357f50d12efd09303c4f # main as of 2024-10-18
+  GIT_TAG db0a2bcc4a14759c992ca89661f687b87d93e923 # main as of 2024-12-09
 )
 
 FetchContent_Declare(
@@ -63,7 +63,7 @@ else()
     FetchContent_Declare(
       imgui
       GIT_REPOSITORY https://github.com/ocornut/imgui.git
-      GIT_TAG v1.90.1)
+      GIT_TAG v1.91.5)
 
     # Enables 32 bit vertex indices for ImGui
     add_compile_definitions("ImDrawIdx=unsigned int")

diff --git a/blocklib/digitizers/test/CMakeLists.txt b/blocklib/digitizers/test/CMakeLists.txt
@@ -1,15 +1,18 @@
 function(add_ut_test TEST_NAME)
-    add_executable(${TEST_NAME} ${TEST_NAME}.cc)
-    if ((CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")) # needed for clang15 (false positives, fixed in clang16)
-        target_compile_options(${TEST_NAME} PRIVATE -Wall)
-        target_link_options(${TEST_NAME} PRIVATE -Wall)
-    else ()
-        target_compile_options(${TEST_NAME} PRIVATE -fsanitize=address -Wall)
-        target_link_options(${TEST_NAME} PRIVATE -fsanitize=address -Wall)
-    endif ()
-    target_include_directories(${TEST_NAME} PRIVATE ${CMAKE_BINARY_DIR}/include ${CMAKE_CURRENT_BINARY_DIR})
-    target_link_libraries(${TEST_NAME} PRIVATE gnuradio-core gr-digitizers refl-cpp fmt ut)
-    add_test(NAME ${TEST_NAME} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME})
+  add_executable(${TEST_NAME} ${TEST_NAME}.cc)
+  if((CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")) # needed for clang15 (false
+                                                # positives, fixed in clang16)
+    target_compile_options(${TEST_NAME} PRIVATE -Wall)
+    target_link_options(${TEST_NAME} PRIVATE -Wall)
+  else()
+    target_compile_options(${TEST_NAME} PRIVATE -fsanitize=address -Wall)
+    target_link_options(${TEST_NAME} PRIVATE -fsanitize=address -Wall)
+  endif()
+  target_include_directories(${TEST_NAME} PRIVATE ${CMAKE_BINARY_DIR}/include
+                                                  ${CMAKE_CURRENT_BINARY_DIR})
+  target_link_libraries(${TEST_NAME} PRIVATE gnuradio-core gr-digitizers fmt ut)
+  add_test(NAME ${TEST_NAME} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR}
+                                     ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME})
 endfunction()
 
 add_ut_test(qa_BlockScalingOffset)
diff --git a/blocklib/picoscope/CMakeLists.txt b/blocklib/picoscope/CMakeLists.txt
@@ -1,22 +1,35 @@
 # TODO do not hardcode
 add_library(ps4000a SHARED IMPORTED GLOBAL)
-set_property(TARGET ps4000a PROPERTY
-             IMPORTED_LOCATION ${PICOSCOPE_PREFIX}/lib/libps4000a.so)
+set_property(TARGET ps4000a PROPERTY IMPORTED_LOCATION
+                                     ${PICOSCOPE_PREFIX}/lib/libps4000a.so)
 target_link_libraries(ps4000a INTERFACE PkgConfig::zlib PkgConfig::libusb)
-target_include_directories(ps4000a INTERFACE ${PICOSCOPE_PREFIX}/include/libps4000a ${PICOSCOPE_PREFIX}/include/libps5000a) # Hack: PicoCallback.h is missing in libps4000a/
+target_include_directories(
+  ps4000a INTERFACE ${PICOSCOPE_PREFIX}/include/libps4000a
+                    ${PICOSCOPE_PREFIX}/include/libps5000a) # Hack:
+                                                            # PicoCallback.h is
+                                                            # missing in
+                                                            # libps4000a/
 
 add_library(ps5000a SHARED IMPORTED GLOBAL)
-set_property(TARGET ps5000a PROPERTY
-             IMPORTED_LOCATION ${PICOSCOPE_PREFIX}/lib/libps5000a.so)
+set_property(TARGET ps5000a PROPERTY IMPORTED_LOCATION
+                                     ${PICOSCOPE_PREFIX}/lib/libps5000a.so)
 target_link_libraries(ps5000a INTERFACE PkgConfig::zlib PkgConfig::libusb)
-target_include_directories(ps5000a INTERFACE ${PICOSCOPE_PREFIX}/include/libps5000a)
+target_include_directories(ps5000a
+                           INTERFACE ${PICOSCOPE_PREFIX}/include/libps5000a)
 
 add_library(fair-picoscope INTERFACE)
-target_include_directories(fair-picoscope INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:include/>)
+target_include_directories(
+  fair-picoscope INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+                           $<INSTALL_INTERFACE:include/>)
 
-target_link_libraries(fair-picoscope INTERFACE ps4000a ps5000a gr-digitizers-options gnuradio-core refl-cpp fmt)
-set_target_properties(gr-digitizers PROPERTIES PUBLIC_HEADER "Picoscope.hpp;Picoscope4000a.hpp;StatusMessages.hpp")
+target_link_libraries(
+  fair-picoscope INTERFACE ps4000a ps5000a gr-digitizers-options gnuradio-core
+                           fmt)
+set_target_properties(
+  gr-digitizers
+  PROPERTIES PUBLIC_HEADER
+             "Picoscope.hpp;Picoscope4000a.hpp;StatusMessages.hpp")
 
-if (ENABLE_GR_DIGITIZERS_TESTING)
-    add_subdirectory(test)
-endif ()
+if(ENABLE_GR_DIGITIZERS_TESTING)
+  add_subdirectory(test)
+endif()