Merge branch 'issue250' of /mnt/bigone/git/repositories/berge/campvis into development

cmake/FindTBB.cmake

@@ -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 "")

cmake/commonconf.cmake

@@ -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

ext/tgt/CMakeLists.txt

@@ -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
 ################################################################################