Merge branch 'main' into 210-add-linux-support

acquire-project · Aug 29, 2024 · 3d0aaa7 · 3d0aaa7
2 parents f93402e + 9d500c9
commit 3d0aaa7
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/cmake/hdcam.cmake b/cmake/hdcam.cmake
@@ -8,8 +8,8 @@
 find_path(DCAMSDK_ROOT_DIR
     NAMES "dcamsdk4/inc/dcamapi4.h"
     PATH_SUFFIXES 
-        "Hamamatsu_DCAMSDK4_v22126552"
         "Hamamatsu_DCAMSDK4_v24026764"
+        "Hamamatsu_DCAMSDK4_v22126552"
     DOC "Hamamatsu DCAM-SDK location"
     NO_CACHE
 )
@@ -29,5 +29,10 @@ if(DCAMSDK_ROOT_DIR)
         )
     endif()
 else()
+<<<<<<< HEAD
     message(FATAL_ERROR "DCAM-SDK NOT FOUND")
-endif()
+endif()
+=======
+    message(STATUS "DCAM-SDK NOT FOUND")
+endif()
+>>>>>>> main