The expiration time for new job artifacts in CI/CD pipelines is now 30 days (GitLab default). Previously generated artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit 4f20262d authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Issue #250: Make Qt dependency in tgt optional (not needed when building...

Issue #250: Make Qt dependency in tgt optional (not needed when building CAMPVis without application)
parent 4eee7eb0
......@@ -6,8 +6,6 @@
# TBB_LICENSE_FILE
IF (WIN32)
MESSAGE(STATUS ${TbbDirectory})
IF(NOT TBB_ROOT)
# check environment variables
IF(NOT "$ENV{TBB_INSTALL_DIR}" STREQUAL "")
......
......@@ -142,7 +142,10 @@ IF(CAMPVIS_DEBUG)
ENDIF()
# minimum Qt version
SET(CampvisRequiredQtVersion "4.8")
IF(CAMPVIS_BUILD_APPLICATION)
SET(TGT_WITH_QT true)
SET(CampvisRequiredQtVersion "4.8")
ENDIF(CAMPVIS_BUILD_APPLICATION)
# detect libraries
......
......@@ -7,12 +7,6 @@ INCLUDE(../../cmake/commonconf.cmake)
MESSAGE(STATUS "Configuring tgt Library")
#
# Qt related stuff:
#
FIND_PACKAGE(Qt4 ${CampvisRequiredQtVersion} REQUIRED QtCore QtGui QtOpenGL)
INCLUDE(${QT_USE_FILE})
# configuration
IF(TGT_WITH_WMI)
ADD_DEFINITIONS("-DTGT_WITH_WMI")
......@@ -20,6 +14,7 @@ IF(TGT_WITH_WMI)
LIST(APPEND CampvisGlobalExternalLibs "WbemUuid")
ENDIF(TGT_WITH_WMI)
# headers
FILE(GLOB TGT_HEADERS *.h event/*.h navigation/*.h qt/*.h)
......@@ -70,14 +65,31 @@ SET(TGT_SOURCES
#navigation
navigation/navigation.cpp
navigation/trackball.cpp
#qt
qt/qtapplication.cpp
qt/qtcanvas.cpp
qt/qtcontextmanager.cpp
qt/qtthreadedcanvas.cpp
qt/qttimer.cpp
)
# Qt related stuff:
IF(TGT_WITH_QT)
FIND_PACKAGE(Qt4 ${CampvisRequiredQtVersion} REQUIRED QtCore QtGui QtOpenGL)
INCLUDE(${QT_USE_FILE})
LIST(APPEND TGT_HEADERS
qt/qtapplication.h
qt/qtcanvas.h
qt/qtcontextmanager.h
qt/qtthreadedcanvas.h
qt/qttimer.h)
LIST(APPEND TGT_SOURCES
qt/qtapplication.cpp
qt/qtcanvas.cpp
qt/qtcontextmanager.cpp
qt/qtthreadedcanvas.cpp
qt/qttimer.cpp)
ENDIF(TGT_WITH_QT)
################################################################################
# define library target
################################################################################
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment