Merge branch 'develop' into humble

uos · Oct 18, 2024 · 4985959 · 4985959
2 parents 2554799 + 6641734
commit 4985959
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CMakeModules/max_cuda_gcc_version.cmake b/CMakeModules/max_cuda_gcc_version.cmake
@@ -20,7 +20,9 @@
 # message(STATUS "Maximum allowed gcc version for cuda is: ${MAX_CUDA_GCC_VERSION}")
 function(max_cuda_gcc_version _CUDA_VERSION _MAX_GCC_VERSION)
 
-if(${_CUDA_VERSION} VERSION_GREATER_EQUAL 12.0.0)
+if(${_CUDA_VERSION} VERSION_GREATER_EQUAL 12.4.0)
+  set(${_MAX_GCC_VERSION} 13 PARENT_SCOPE)
+elseif(${_CUDA_VERSION} VERSION_GREATER_EQUAL 12.0.0)
   set(${_MAX_GCC_VERSION} 12 PARENT_SCOPE)
 elseif(${_CUDA_VERSION} VERSION_GREATER 11.4.0)   # 11.4.1+, 11.5  -> 11
   set(${_MAX_GCC_VERSION} 11 PARENT_SCOPE)
@@ -48,4 +50,4 @@ elseif(${_CUDA_VERSION} VERSION_GREATER 3)    # 4.0 -> 4.4
   set(${_MAX_GCC_VERSION} 4.4 PARENT_SCOPE)
 endif()
 
-endfunction()
+endfunction()
diff --git a/package.xml b/package.xml
@@ -40,6 +40,7 @@ The Las Vegas Surface Reconstruction Toolkit is an Open Source toolkit to recons
   <depend>lz4</depend>
   <depend>libopencv-dev</depend>
   <depend>yaml-cpp</depend>
+  <depend>libtiff-dev</depend>
 
   <export>
     <build_type>cmake</build_type>