Update CMake config for internal superbuild, for Kwiver V2

Kitware · Apr 17, 2024 · a922a73 · a922a73
1 parent 1664736
commit a922a73
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/CMake/telesculptor-external-fletch.cmake b/CMake/telesculptor-external-fletch.cmake
@@ -49,7 +49,7 @@ endif()
 ExternalProject_Add(fletch
   PREFIX ${TELESCULPTOR_BINARY_DIR}
   GIT_REPOSITORY "https://github.com/Kitware/fletch.git"
-  GIT_TAG 94870a290a06db845e80816863bb6d1b9cb12085
+  GIT_TAG ec3aeddc284c9707cce6bd1569b072c278cf0102
   #GIT_SHALLOW 1
   SOURCE_DIR ${TELESCULPTOR_EXTERNAL_DIR}/fletch
   BINARY_DIR ${TELESCULPTOR_EXTERNAL_DIR}/fletch-build
@@ -59,7 +59,7 @@ ExternalProject_Add(fletch
     -Dfletch_BUILD_CXX11:BOOL=ON
     -Dfletch_BUILD_WITH_PYTHON:BOOL=${TELESCULPTOR_ENABLE_PYTHON}
     -Dfletch_ENABLE_Boost:BOOL=${TELESCULPTOR_ENABLE_FLETCH_BOOST}
-    -DBoost_SELECT_VERSION:STRING=1.65.1
+    -DBoost_SELECT_VERSION:STRING=1.78.0
     -Dfletch_ENABLE_Caffe:BOOL=OFF
     -Dfletch_ENABLE_Caffe_Segnet:BOOL=OFF
     -Dfletch_ENABLE_Ceres:BOOL=${TELESCULPTOR_ENABLE_FLETCH_CERES}
@@ -68,8 +68,9 @@ ExternalProject_Add(fletch
     -Dfletch_ENABLE_Darknet_OpenCV:BOOL=OFF
     -Dfletch_ENABLE_Eigen:BOOL=${TELESCULPTOR_ENABLE_FLETCH_EIGEN}
     -Dfletch_ENABLE_FFmpeg:BOOL=${TELESCULPTOR_ENABLE_FLETCH_FFMPEG}
-    -DFFmpeg_SELECT_VERSION:STRING=3.3.3
+    -DFFmpeg_SELECT_VERSION:STRING=5.1.2
     -Dfletch_ENABLE_GDAL:BOOL=${TELESCULPTOR_ENABLE_FLETCH_GDAL}
+    -DGDAL_SELECT_VERSION:STRING=2.4.4
     -Dfletch_ENABLE_GEOS:BOOL=${TELESCULPTOR_ENABLE_FLETCH_GEOS}
     -Dfletch_ENABLE_GFlags:BOOL=OFF
     -Dfletch_ENABLE_GLog:BOOL=${TELESCULPTOR_ENABLE_FLETCH_CERES}
@@ -81,7 +82,7 @@ ExternalProject_Add(fletch
     -Dfletch_ENABLE_LevelDB:BOOL=OFF
     -Dfletch_ENABLE_OpenBLAS:BOOL=OFF
     -Dfletch_ENABLE_OpenCV:BOOL=${TELESCULPTOR_ENABLE_FLETCH_OPENCV}
-    -DOpenCV_SELECT_VERSION:STRING=4.5.1
+    -DOpenCV_SELECT_VERSION:STRING=4.9.0
     -Dfletch_ENABLE_OpenCV_FFmpeg:BOOL=ON
     -Dfletch_ENABLE_OpenCV_contrib:BOOL=ON
     -Dfletch_ENABLE_OpenCV_highgui:BOOL=ON
@@ -97,9 +98,10 @@ ExternalProject_Add(fletch
     -Dfletch_ENABLE_Snappy:BOOL=OFF
     -Dfletch_ENABLE_SQLite3:BOOL=${TELESCULPTOR_ENABLE_FLETCH_PROJ}
     -Dfletch_ENABLE_SuiteSparse:BOOL=${TELESCULPTOR_ENABLE_FLETCH_CERES}
+    -DBUILD_CXSPARSE_ONLY:BOOL=ON
     -Dfletch_ENABLE_TinyXML:BOOL=OFF
     -Dfletch_ENABLE_VTK:BOOL=${TELESCULPTOR_ENABLE_FLETCH_VTK}
-    -DVTK_SELECT_VERSION:STRING=9.0
+    -DVTK_SELECT_VERSION:STRING=9.1
     -Dfletch_ENABLE_VXL:BOOL=ON
     -Dfletch_ENABLE_YAMLcpp:BOOL=OFF
     -Dfletch_ENABLE_ZLib:BOOL=${TELESCULPTOR_ENABLE_FLETCH_ZLIB}
@@ -112,6 +114,7 @@ ExternalProject_Add(fletch
     -Dfletch_ENABLE_openjpeg:BOOL=OFF
     -Dfletch_ENABLE_qtExtensions:BOOL=ON
     -Dfletch_ENABLE_pybind11:BOOL=${TELESCULPTOR_ENABLE_PYTHON}
+    -Dpybind11_SELECT_VERSION:STRING=2.10.3
     -Dfletch_ENABLE_shapelib:BOOL=OFF
     -Dfletch_BUILD_WITH_CUDA:BOOL=${TELESCULPTOR_ENABLE_CUDA}
     -DCUDA_TOOLKIT_ROOT_DIR:PATH=${CUDA_TOOLKIT_ROOT_DIR}

diff --git a/CMake/telesculptor-external-kwiver.cmake b/CMake/telesculptor-external-kwiver.cmake
@@ -17,8 +17,9 @@ ExternalProject_Add(kwiver
   SOURCE_DIR ${TELESCULPTOR_EXTERNAL_DIR}/kwiver
   BINARY_DIR ${TELESCULPTOR_EXTERNAL_DIR}/kwiver-build
   STAMP_DIR ${TELESCULPTOR_STAMP_DIR}
-  GIT_REPOSITORY "https://github.com/Kitware/kwiver.git"
-  GIT_TAG 08dbcd8a59a6930ac6f1639c2db8a94c12dfd96e
+  GIT_REPOSITORY "https://gitlab.kitware.com/kwiver/kwiver.git"
+  # Most recent available "main" commit
+  GIT_TAG 0c2d29c554d21faf922a618b2822380652dee540
   #GIT_SHALLOW 1
   CMAKE_CACHE_ARGS
     -DBUILD_SHARED_LIBS:BOOL=ON
@@ -32,8 +33,9 @@ ExternalProject_Add(kwiver
     -DKWIVER_ENABLE_DLL_WARNINGS:BOOL=OFF
     -DKWIVER_ENABLE_DOCS:BOOL=OFF
     -DKWIVER_ENABLE_EXAMPLES:BOOL=OFF
-    -DKWIVER_ENABLE_EXTRAS:BOOL=ON
+    -DKWIVER_ENABLE_EXTRAS:BOOL=OFF
     -DKWIVER_ENABLE_FFMPEG:BOOL=ON
+    -DKWIVER_ENABLE_FFMPEG_CUDA:BOOL=OFF
     -DKWIVER_ENABLE_KPF:BOOL=OFF
     -DKWIVER_ENABLE_GDAL:BOOL=ON
     -DKWIVER_ENABLE_LOG4CPLUS:BOOL=ON
@@ -48,7 +50,7 @@ ExternalProject_Add(kwiver
     -DKWIVER_ENABLE_QT:BOOL=ON
     -DKWIVER_ENABLE_QT_EXT:BOOL=ON
     -DKWIVER_ENABLE_RightTrack:BOOL=OFF
-    -DKWIVER_ENABLE_SPROKIT:BOOL=ON
+    -DKWIVER_ENABLE_SPROKIT:BOOL=OFF
     -DKWIVER_ENABLE_SUPER3D:BOOL=ON
     -DKWIVER_ENABLE_TESTS:BOOL=${TELESCULPTOR_ENABLE_TESTING}
     -DKWIVER_ENABLE_TOOLS:BOOL=${TELESCULPTOR_ENABLE_TOOLS}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,6 +46,8 @@ set(TELESCULPTOR_BINARY_DIR     "${CMAKE_BINARY_DIR}")
 set(TELESCULPTOR_EXTERNAL_DIR   "${TELESCULPTOR_BINARY_DIR}/external")
 set(TELESCULPTOR_STAMP_DIR       ${TELESCULPTOR_EXTERNAL_DIR}/stamps)
 
+set(CMAKE_CXX_STANDARD 17)
+
 if(NOT CMAKE_BUILD_TYPE)
   message(STATUS "Setting build type to 'Release' as none was specified.")
   set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build." FORCE)