Filter out interface libraries in headless build.

Author: ayla

src/CMakeLists.txt

@@ -75,9 +75,9 @@ MARK_AS_ADVANCED(BUILD_SHARED_LIBS)
 
 ########################################################################
 # Headless build
-
-OPTION(BUILD_HEADLESS "Build headless version, without Qt" OFF)
-MARK_AS_ADVANCED(BUILD_HEADLESS)
+#
+#OPTION(BUILD_HEADLESS "Build headless version, without Qt" OFF)
+#MARK_AS_ADVANCED(BUILD_HEADLESS)
 
 
 ########################################################################
@@ -600,7 +600,9 @@ MARK_AS_ADVANCED(CMAKE_LIBRARY_OUTPUT_DIRECTORY CMAKE_RUNTIME_OUTPUT_DIRECTORY)
 SET(BUILD_FROM_TOP_LEVEL 1)
 
 ADD_SUBDIRECTORY(Externals)
-ADD_SUBDIRECTORY(Interface)
+IF(NOT BUILD_HEADLESS)
+  ADD_SUBDIRECTORY(Interface)
+ENDIF()
 ADD_SUBDIRECTORY(Core)
 ADD_SUBDIRECTORY(Dataflow)
 ADD_SUBDIRECTORY(Modules)
@@ -742,23 +744,25 @@ SET_PROPERTY(TARGET Engine_Network         PROPERTY FOLDER "Dataflow/Engine")
 SET_PROPERTY(TARGET Engine_Scheduler         PROPERTY FOLDER "Dataflow/Engine")
 SET_PROPERTY(TARGET Dataflow_State         PROPERTY FOLDER "Dataflow")
 
-SET_PROPERTY(TARGET Interface_Modules_Base   PROPERTY FOLDER "Interface/Modules")
-SET_PROPERTY(TARGET Interface_Modules_DataIO   PROPERTY FOLDER "Interface/Modules")
-SET_PROPERTY(TARGET Interface_Modules_Math   PROPERTY FOLDER "Interface/Modules")
-SET_PROPERTY(TARGET Interface_Modules_Visualization   PROPERTY FOLDER "Interface/Modules")
-SET_PROPERTY(TARGET Interface_Modules_Render   PROPERTY FOLDER "Interface/Modules")
-SET_PROPERTY(TARGET Interface_Modules_FiniteElements   PROPERTY FOLDER "Interface/Modules")
-SET_PROPERTY(TARGET Interface_Modules_BrainStimulator   PROPERTY FOLDER "Interface/Modules")
-SET_PROPERTY(TARGET Interface_Modules_Testing   PROPERTY FOLDER "Interface/Modules")
-SET_PROPERTY(TARGET Interface_Modules_String   PROPERTY FOLDER "Interface/Modules")
-SET_PROPERTY(TARGET Interface_Modules_Fields   PROPERTY FOLDER "Interface/Modules")
-SET_PROPERTY(TARGET Interface_Modules_Bundle   PROPERTY FOLDER "Interface/Modules")
-SET_PROPERTY(TARGET Interface_Modules_Matlab   PROPERTY FOLDER "Interface/Modules")
-SET_PROPERTY(TARGET Interface_Modules_Forward   PROPERTY FOLDER "Interface/Modules")
-SET_PROPERTY(TARGET Interface_Modules_Inverse   PROPERTY FOLDER "Interface/Modules")
-SET_PROPERTY(TARGET Interface_Modules_Teem   PROPERTY FOLDER "Interface/Modules")
-SET_PROPERTY(TARGET Interface_Modules_Factory   PROPERTY FOLDER "Interface/Modules")
-SET_PROPERTY(TARGET Interface_Application   PROPERTY FOLDER "Interface/Application")
+IF(NOT BUILD_HEADLESS)
+  SET_PROPERTY(TARGET Interface_Modules_Base   PROPERTY FOLDER "Interface/Modules")
+  SET_PROPERTY(TARGET Interface_Modules_DataIO   PROPERTY FOLDER "Interface/Modules")
+  SET_PROPERTY(TARGET Interface_Modules_Math   PROPERTY FOLDER "Interface/Modules")
+  SET_PROPERTY(TARGET Interface_Modules_Visualization   PROPERTY FOLDER "Interface/Modules")
+  SET_PROPERTY(TARGET Interface_Modules_Render   PROPERTY FOLDER "Interface/Modules")
+  SET_PROPERTY(TARGET Interface_Modules_FiniteElements   PROPERTY FOLDER "Interface/Modules")
+  SET_PROPERTY(TARGET Interface_Modules_BrainStimulator   PROPERTY FOLDER "Interface/Modules")
+  SET_PROPERTY(TARGET Interface_Modules_Testing   PROPERTY FOLDER "Interface/Modules")
+  SET_PROPERTY(TARGET Interface_Modules_String   PROPERTY FOLDER "Interface/Modules")
+  SET_PROPERTY(TARGET Interface_Modules_Fields   PROPERTY FOLDER "Interface/Modules")
+  SET_PROPERTY(TARGET Interface_Modules_Bundle   PROPERTY FOLDER "Interface/Modules")
+  SET_PROPERTY(TARGET Interface_Modules_Matlab   PROPERTY FOLDER "Interface/Modules")
+  SET_PROPERTY(TARGET Interface_Modules_Forward   PROPERTY FOLDER "Interface/Modules")
+  SET_PROPERTY(TARGET Interface_Modules_Inverse   PROPERTY FOLDER "Interface/Modules")
+  SET_PROPERTY(TARGET Interface_Modules_Teem   PROPERTY FOLDER "Interface/Modules")
+  SET_PROPERTY(TARGET Interface_Modules_Factory   PROPERTY FOLDER "Interface/Modules")
+  SET_PROPERTY(TARGET Interface_Application   PROPERTY FOLDER "Interface/Application")
+ENDIF()
 
 SET_PROPERTY(TARGET Modules_Basic   PROPERTY FOLDER "Modules/Basic")
 SET_PROPERTY(TARGET Modules_Math   PROPERTY FOLDER "Modules/Math")
@@ -849,7 +853,9 @@ IF(BUILD_TESTING)
   SET_PROPERTY(TARGET Modules_Legacy_Matlab_DataIO_Tests PROPERTY FOLDER "Modules/DataIO")
   SET_PROPERTY(TARGET Modules_Factory_Tests   PROPERTY FOLDER "Modules/Basic")
 
-  SET_PROPERTY(TARGET Interface_Modules_Render_Tests PROPERTY FOLDER "Interface/Tests")
+  IF(NOT BUILD_HEADLESS)
+    SET_PROPERTY(TARGET Interface_Modules_Render_Tests PROPERTY FOLDER "Interface/Tests")
+  ENDIF()
   IF(BUILD_WITH_PYTHON)
     SET_PROPERTY(TARGET Core_Python_Tests     PROPERTY FOLDER "Core/Tests")
     SET_PROPERTY(TARGET Engine_Python_Tests   PROPERTY FOLDER "Dataflow/Engine/Tests")

src/Main/CMakeLists.txt

@@ -41,9 +41,11 @@ IF(APPLE)
   ADD_EXECUTABLE(${TEST_APPLICATION_NAME}
     ${SCIRunMain_SOURCES}
   )
-  TARGET_LINK_LIBRARIES(${TEST_APPLICATION_NAME}
-    Interface_Application
-  )
+  IF(NOT BUILD_HEADLESS)
+    TARGET_LINK_LIBRARIES(${TEST_APPLICATION_NAME}
+      Interface_Application
+    )
+  ENDIF()
 
   LIST(APPEND SCIRunMain_SOURCES "${APPLICATION_OSX_ICON_FULL_PATH}")
   SET_SOURCE_FILES_PROPERTIES(${APPLICATION_OSX_ICON_FULL_PATH}
@@ -85,10 +87,15 @@ ELSE()
 ENDIF()
 
 TARGET_LINK_LIBRARIES(${APPLICATION_NAME}
-  Interface_Application
   Core_Util_Legacy
 )
 
+IF(NOT BUILD_HEADLESS)
+  TARGET_LINK_LIBRARIES(${APPLICATION_NAME}
+    Interface_Application
+  )
+ENDIF()
+
 IF(BUILD_WITH_PYTHON)
   TARGET_LINK_LIBRARIES(${APPLICATION_NAME}
     Core_Python
@@ -145,12 +152,17 @@ IF(APPLE AND BUILD_BUNDLE)
     SET(SCIRUN_LIBS "Core_Application"
                     "Core_Python"
                     "SCIRunPythonAPI"
-                    "Interface_Application"
                     "Engine_Network"
-                    "Interface_Modules_Factory"
-                    "Interface_Modules_Render"
                     "Core_ConsoleApplication"
     )
+    IF(BUILD_HEADLESS)
+      LIST(APPEND SCIRUN_LIBS
+                  "Interface_Application"
+                  "Interface_Modules_Factory"
+                  "Interface_Modules_Render"
+      )
+    ENDIF()
+
     FOREACH(lib ${SCIRUN_LIBS})
       ADD_CUSTOM_COMMAND(TARGET ${APPLICATION_NAME}
         POST_BUILD