Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CAMP
campvis-public
Commits
c1b0f213
Commit
c1b0f213
authored
Nov 18, 2013
by
Christian Schulte zu Berge
Browse files
Merge branch 'issue250' of /mnt/bigone/git/repositories/berge/campvis into development
parents
4eee7eb0
4f20262d
Changes
3
Hide whitespace changes
Inline
Side-by-side
cmake/FindTBB.cmake
View file @
c1b0f213
...
...
@@ -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
View file @
c1b0f213
...
...
@@ -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
View file @
c1b0f213
...
...
@@ -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
################################################################################
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment