Clarify enable flag logic with new flag

VIAME · Aug 18, 2023 · 52a4e50 · 52a4e50
1 parent b4518e1
commit 52a4e50
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -95,7 +95,6 @@ option( VIAME_ENABLE_DARKNET        "Enable Darknet (YOLO) plugin"  ON )
 # Add secondary plugin enable flags (non-advanced)
 ##
 option( VIAME_ENABLE_MATLAB         "Enable Matlab plugins"         OFF )
-option( VIAME_ENABLE_SCALLOP_TK     "Enable ScallopTK plugin"       OFF )
 option( VIAME_ENABLE_TENSORFLOW     "Enable TensorFlow plugins"     OFF )
 option( VIAME_ENABLE_TENSORRT       "Enable TensorRT plugins"       OFF )
 option( VIAME_ENABLE_SMQTK          "Enable SMQTK plugins"          ON )
@@ -104,19 +103,23 @@ option( VIAME_ENABLE_SMQTK          "Enable SMQTK plugins"          ON )
 # Add secondary plugin enable flags (advanced)
 ##
 option( VIAME_ENABLE_BURNOUT        "Enable Burn-Out plugins"       OFF )
-option( VIAME_ENABLE_LEARN          "Enable LEARN plugins"          OFF )
 option( VIAME_ENABLE_CAFFE          "Enable Caffe plugins"          OFF )
 option( VIAME_ENABLE_GDAL           "Enable GDAL image source"      OFF )
 option( VIAME_ENABLE_ITK            "Enable ITK plugins"            OFF )
 option( VIAME_ENABLE_ITK_EXTRAS     "Enable ITK GUI and extra algs" OFF )
+option( VIAME_ENABLE_LEARN          "Enable LEARN plugins"          OFF )
+option( VIAME_ENABLE_POSTGRESQL     "Enable PostgreSQL plugins"     OFF )
+option( VIAME_ENABLE_SCALLOP_TK     "Enable ScallopTK plugin"       OFF )
 option( VIAME_ENABLE_UW_PREDICTOR   "Enable UW predictor plugin"    OFF )
 
 mark_as_advanced( VIAME_ENABLE_BURNOUT )
-mark_as_advanced( VIAME_ENABLE_LEARN )
 mark_as_advanced( VIAME_ENABLE_CAFFE )
 mark_as_advanced( VIAME_ENABLE_GDAL )
 mark_as_advanced( VIAME_ENABLE_ITK )
 mark_as_advanced( VIAME_ENABLE_ITK_EXTRAS )
+mark_as_advanced( VIAME_ENABLE_LEARN )
+mark_as_advanced( VIAME_ENABLE_VIAME_ENABLE_POSTGRESQL )
+mark_as_advanced( VIAME_ENABLE_SCALLOP_TK )
 mark_as_advanced( VIAME_ENABLE_UW_PREDICTOR )
 
 ###
@@ -323,6 +326,10 @@ if( VIAME_ENABLE_LEARN )
   set( VIAME_ENABLE_PYTORCH-VIDEO      ON CACHE BOOL "Torch Video required for project" FORCE )
 endif()
 
+if( VIAME_ENABLE_SMQTK )
+  set( VIAME_ENABLE_POSTGRESQL  ON CACHE BOOL "PostgreSQL required for project" FORCE )
+endif()
+
 if( VIAME_ENABLE_PYTORCH-VIDEO )
   set( VIAME_ENABLE_FFMPEG  ON CACHE BOOL "FFMpeg required for project" FORCE )
 endif()
@@ -783,7 +790,7 @@ if( VIAME_BUILD_DEPENDENCIES )
     include( add_project_python_deps )
   endif()
 
-  if( WIN32 AND ( VIAME_ENABLE_KWIVER OR VIAME_ENABLE_SMQTK ) )
+  if( WIN32 AND VIAME_ENABLE_POSTGRESQL )
     include( add_project_postgres )
   endif()
 

diff --git a/cmake/add_project_fletch.cmake b/cmake/add_project_fletch.cmake
@@ -138,7 +138,7 @@ else()
   )
 endif()
 
-if( VIAME_ENABLE_SMQTK )
+if( VIAME_ENABLE_POSTGRESQL )
   set( FLETCH_DEP_FLAGS
     ${FLETCH_DEP_FLAGS}
     -Dfletch_ENABLE_PostgreSQL:BOOL=${DEP_COND_ENABLE}

diff --git a/cmake/add_project_kwiver.cmake b/cmake/add_project_kwiver.cmake
@@ -83,7 +83,7 @@ ExternalProject_Add(kwiver
     -DKWIVER_ENABLE_PROJ:BOOL=OFF
     -DKWIVER_ENABLE_FFMPEG:BOOL=${VIAME_ENABLE_FFMPEG}
     -DKWIVER_ENABLE_FFMPEG_CUDA:BOOL=OFF
-    -DKWIVER_ENABLE_DATABASE:BOOL=${VIAME_ENABLE_SMQTK}
+    -DKWIVER_ENABLE_DATABASE:BOOL=${VIAME_ENABLE_POSTGRESQL}
     -DKWIVER_ENABLE_SVM:BOOL=${VIAME_ENABLE_SMQTK}
     -DCUSTOM_LIBSVM_PATH:PATH=${VIAME_INSTALL_PREFIX}
     -DKWIVER_ENABLE_BURNOUT:BOOL=${VIAME_ENABLE_BURNOUT}