Przeglądaj źródła

Fix CMake unused variable warnings

Introduced by commit 8c9868f5, the variables "ExternalProjectsContrib_DIR"
and "PluginsContrib_DIR" where unconditionally passed down when
configuring CTK inner project.

This commit avoid the "unused variable" warnings by checking the value
of "CTK_USE_CONTRIBUTED_PLUGINS" variable before passing the variables.
Jean-Christophe Fillion-Robin 12 lat temu
rodzic
commit
8855f8ab46
1 zmienionych plików z 8 dodań i 2 usunięć
  1. 8 2
      SuperBuild.cmake

+ 8 - 2
SuperBuild.cmake

@@ -125,6 +125,14 @@ string(REPLACE ";" "^" CTK_SUPERBUILD_EP_VARNAMES "${CTK_SUPERBUILD_EP_VARNAMES}
 # endforeach()
 
 #-----------------------------------------------------------------------------
+if(CTK_USE_CONTRIBUTED_PLUGINS)
+  list(APPEND CTK_SUPERBUILD_EP_ARGS
+    -DExternalProjectsContrib_DIR:STRING=${ExternalProjectsContrib_DIR}
+    -DPluginsContrib_DIR:STRING=${PluginsContrib_DIR}
+    )
+endif()
+
+#-----------------------------------------------------------------------------
 # CTK Configure
 #
 set(proj CTK-Configure)
@@ -157,8 +165,6 @@ ExternalProject_Add(${proj}
     -DCTK_INSTALL_INCLUDE_DIR:STRING=${CTK_INSTALL_INCLUDE_DIR}
     -DCTK_INSTALL_DOC_DIR:STRING=${CTK_INSTALL_DOC_DIR}
     -DCTK_EXTERNAL_LIBRARY_DIRS:STRING=${CTK_EXTERNAL_LIBRARY_DIRS}
-    -DExternalProjectsContrib_DIR:STRING=${ExternalProjectsContrib_DIR}
-    -DPluginsContrib_DIR:STRING=${PluginsContrib_DIR}
     -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
     ${CTK_SUPERBUILD_EP_ARGS}
     -DCTK_SUPERBUILD_EP_VARNAMES:STRING=${CTK_SUPERBUILD_EP_VARNAMES}