16.12.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit bdf1c858 authored by schultezub's avatar schultezub
Browse files

git-svn-id: https://camplinux.in.tum.de/svn/campvis/trunk@164 bb408c1c-ae56-11e1-83d9-df6b3e0c105e
parent 2c4854f4
......@@ -13,7 +13,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
OPTION(TUMVIS_SHARED_LIBS "Build shared libraries?" ON )
OPTION(TUMVIS_PRECOMPILED_HEADER "Use pre-compiled headers?" ON )
OPTION(TUMVIS_DEBUG "Activate debug code?" ON )
OPTION(TUMVIS_BUILD_APPLICATION "Build TUMVis Application" ON )
OPTION(TUMVIS_BUILD_CORE "Build TUMVis Core" ON )
OPTION(TUMVIS_BUILD_MODULES "Build TUMVis Modules" ON )
OPTION(TUMVIS_BUILD_LIB_TGT "Build TGT Library" ON )
IF(WIN32)
......@@ -36,6 +38,14 @@ IF(TUMVIS_BUILD_CORE)
ADD_SUBDIRECTORY(core)
ENDIF()
IF(TUMVIS_BUILD_MODULES)
ADD_SUBDIRECTORY(modules)
ENDIF()
IF(TUMVIS_BUILD_APPLICATION)
ADD_SUBDIRECTORY(application)
ENDIF()
#
# Copy External DLLs
#
......
PROJECT(tumvis-application)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
INCLUDE(../cmake/commonconf.cmake)
MESSAGE(STATUS "Configuring TUMVis Application")
FILE(GLOB TUMVIS_APPLICATION_SOURCES
*.cpp
)
FILE(GLOB TUMVIS_APPLICATION_HEADERS
*.h
)
#SET(TUMVIS_APPLICATION_SOURCES
# application/tumvis.cpp
# application/tumvispainter.cpp
# datastructures/
#)
#SET(TUMVIS_APPLICATION_HEADERS
# application/tumvispainter.h
#)
#
# Qt related stuff:
#
FIND_PACKAGE(Qt4 ${TUMVIS_REQUIRED_QT_VERSION} REQUIRED QtCore QtGui QtOpenGL)
#QT4_WRAP_CPP(TUMVIS_APPLICATION_MOC ${TUMVIS_APPLICATION_HEADERS})
INCLUDE(${QT_USE_FILE})
ADD_EXECUTABLE(tumvis-application
${TUMVIS_APPLICATION_SOURCES} ${TUMVIS_APPLICATION_HEADERS}
# ${TUMVIS_APPLICATION_MOC}
)
ADD_DEFINITIONS(${TUMVIS_DEFINITIONS} ${QT_DEFINITIONS})
INCLUDE_DIRECTORIES(${TUMVIS_INCLUDE_DIRECTORIES})
TARGET_LINK_LIBRARIES(tumvis-application tumvis-core tgt ${TUMVIS_EXTERNAL_LIBRARIES} ${QT_LIBRARIES})
......@@ -59,7 +59,7 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${TUMVIS_HOME}/bin")
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${TUMVIS_HOME}/bin")
# common include directories
LIST(APPEND TUMVIS_INCLUDE_DIRECTORIES "${TUMVIS_HOME}/core" "${TUMVIS_HOME}/ext" "${TUMVIS_HOME}/tools")
LIST(APPEND TUMVIS_INCLUDE_DIRECTORIES "${TUMVIS_HOME}/core" "${TUMVIS_HOME}/modules" "${TUMVIS_HOME}/ext" "${TUMVIS_HOME}/tools")
LIST(APPEND TUMVIS_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
# platform-dependent configuration
......
......@@ -5,12 +5,10 @@ INCLUDE(../cmake/commonconf.cmake)
MESSAGE(STATUS "Configuring TUMVis Core")
FILE(GLOB TUMVIS_CORE_SOURCES
application/*.cpp
datastructures/*.cpp
)
FILE(GLOB TUMVIS_CORE_HEADERS
application/*.h
datastructures/*.h
)
......@@ -29,12 +27,13 @@ FILE(GLOB TUMVIS_CORE_HEADERS
#
FIND_PACKAGE(Qt4 ${TUMVIS_REQUIRED_QT_VERSION} REQUIRED QtCore QtGui QtOpenGL)
#QT4_WRAP_CPP(TUMVIS_CORE_MOC ${TUMVIS_CORE_HEADERS})
INCLUDE(${QT_USE_FILE})
ADD_EXECUTABLE(tumvis-core
ADD_LIBRARY(tumvis-core
${TUMVIS_CORE_SOURCES} ${TUMVIS_CORE_HEADERS}
# ${TUMVIS_CORE_MOC}
)
)
ADD_DEFINITIONS(${TUMVIS_DEFINITIONS} ${QT_DEFINITIONS})
INCLUDE_DIRECTORIES(${TUMVIS_INCLUDE_DIRECTORIES})
TARGET_LINK_LIBRARIES(tumvis-core tgt ${TUMVIS_EXTERNAL_LIBRARIES} ${QT_LIBRARIES})
......@@ -2,7 +2,7 @@
#define imagedata_h__
#include "datastructures/abstractdata.h"
#include "datastructures/imagemapping.h"
#include "datastructures/imagemappinginformation.h"
#include "tgt/vector.h"
namespace TUMVis {
......
#include "imagemapping.h"
#include "imagemappinginformation.h"
namespace TUMVis {
......
# Install script for directory: D:/Daten/Christian/Visual Studio 2008/Projects/tumvis/ext/tgt
# Install script for directory: D:/Daten/Christian/Dokumente/Eigene Dokumente/TUM/work/tumvis/ext/tgt
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
......
PROJECT(tumvis-modules)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
INCLUDE(../cmake/commonconf.cmake)
MESSAGE(STATUS "Configuring TUMVis Modules")
FILE(GLOB TUMVIS_MODULES_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
io/*.cpp
)
FILE(GLOB TUMVIS_MODULES_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
io/*.h
)
#SET(TUMVIS_MODULES_SOURCES
# application/tumvis.cpp
# application/tumvispainter.cpp
# datastructures/
#)
#SET(TUMVIS_MODULES_HEADERS
# application/tumvispainter.h
#)
#
# Qt related stuff:
#
FIND_PACKAGE(Qt4 ${TUMVIS_REQUIRED_QT_VERSION} REQUIRED QtCore QtGui QtOpenGL)
#QT4_WRAP_CPP(TUMVIS_MODULES_MOC ${TUMVIS_MODULES_HEADERS})
INCLUDE(${QT_USE_FILE})
ADD_LIBRARY(tumvis-modules
${TUMVIS_CORE_SOURCES} ${TUMVIS_CORE_HEADERS}
# ${TUMVIS_CORE_MOC}
)
ADD_DEFINITIONS(${TUMVIS_DEFINITIONS} ${QT_DEFINITIONS})
INCLUDE_DIRECTORIES(${TUMVIS_INCLUDE_DIRECTORIES})
TARGET_LINK_LIBRARIES(tumvis-modules tumvis-core tgt ${TUMVIS_EXTERNAL_LIBRARIES} ${QT_LIBRARIES})
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