Merge pull request #1946 from ghutchis/fixup-qt-tests

Only build MoleQueue tests when requested

tests/qtgui/CMakeLists.txt

@@ -4,9 +4,6 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}"
   "${AvogadroLibs_SOURCE_DIR}/tests/core")
 
 find_package(Qt${QT_VERSION} COMPONENTS Widgets Network Test REQUIRED)
-# Pull in MoleQueue for QtJson
-find_package(MoleQueue REQUIRED NO_MODULE)
-include_directories(${MoleQueue_INCLUDE_DIRS})
 
 # Find python interpreter for input generator
 find_package(PythonInterp 3)
@@ -25,10 +22,19 @@ set(tests
   # GitHub is showing this as a free() bug
   # TODO: Fix this
   # Molecule
-  MoleQueueQueueListModel
   RWMolecule
   )
 
+if (BUILD_MOLEQUEUE)
+  # Pull in MoleQueue
+  find_package(MoleQueue REQUIRED NO_MODULE)
+  include_directories(${MoleQueue_INCLUDE_DIRS})
+  list(APPEND tests
+    MoleQueueQueueListModel
+  )
+  set(MoleQueueLink Avogadro::MoleQueue MoleQueueClient)
+endif()
+
 if(PYTHON_EXECUTABLE AND AVOGADRO_DATA)
   list(APPEND tests
 # FIXME: These tests are broken
@@ -48,8 +54,9 @@ endforeach()
 
 # Add a single executable for all of our tests.
 add_executable(AvogadroQtGuiTests ${testSrcs})
-target_link_libraries(AvogadroQtGuiTests Avogadro::QtGui Avogadro::MoleQueue
-  MoleQueueClient ${GTEST_BOTH_LIBRARIES} ${EXTRA_LINK_LIB} Qt${QT_VERSION}::Widgets Qt${QT_VERSION}::Test)
+target_link_libraries(AvogadroQtGuiTests Avogadro::QtGui ${MoleQueueLink}
+ ${GTEST_BOTH_LIBRARIES} ${EXTRA_LINK_LIB}
+ Qt${QT_VERSION}::Widgets Qt${QT_VERSION}::Test)
 
 # Now add all of the tests, using the gtest_filter argument so that only those
 # cases are run in each test invocation.