mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
fbfbdfca84
Integrated Fwk updates in Resinsight branch up to changelist 173. Summary of changes: * Rewrite of cvf::OverlayItem to allow fixed user controlled positioning of the items. * Removed pure virtual functions OverlayItem::maximumSize() and OverlayItem::minimumSize(). * Use caf::AboutDialog instead of modified cvfqt::BasicAboutDialog. * Removed lapack from link line due to fail on Ubuntu 12.04 when lapack isn't installed. * Fix in OpenGLContext::saveOpenGLState() to avoid application corruption when running on RedHat with VMWare. * Removed unused font manager. * Console assert handler only calls __debugbreak() if debugger is present. Otherwise, calls abort(). Done after trouble running gtest death tests. * Made component access functions in Color3f, Color3ub, Color4f, Color4ub inline. * Added conversion functions between TextureImage and QImage to cvfqt::Utils class. * Optimized TextureImage::setPixel() - relies on new inlined component-wise access functions for Color4ub. * Added TextureImage::clear() and non-const version of TextureImage::ptr().
46 lines
899 B
CMake
46 lines
899 B
CMake
cmake_minimum_required(VERSION 2.8)
|
|
|
|
project(LibGuiQt)
|
|
|
|
|
|
# We're getting too much trouble from Qt using strict
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CEE_BASE_CXX_FLAGS}")
|
|
|
|
if (CMAKE_COMPILER_IS_GNUCXX)
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-long-long")
|
|
endif()
|
|
|
|
|
|
find_package(Qt4 REQUIRED)
|
|
include(${QT_USE_FILE})
|
|
|
|
|
|
include_directories(../LibCore)
|
|
include_directories(../LibGeometry)
|
|
include_directories(../LibRender)
|
|
include_directories(../LibViewing)
|
|
|
|
|
|
set(CEE_HEADER_FILES
|
|
cvfqtBasicAboutDialog.h
|
|
cvfqtCvfBoundQGLContext.h
|
|
cvfqtMouseState.h
|
|
cvfqtOpenGLContext.h
|
|
cvfqtOpenGLWidget.h
|
|
cvfqtPerformanceInfoHud.h
|
|
cvfqtUtils.h
|
|
)
|
|
|
|
set(CEE_SOURCE_FILES
|
|
cvfqtBasicAboutDialog.cpp
|
|
cvfqtCvfBoundQGLContext.cpp
|
|
cvfqtMouseState.cpp
|
|
cvfqtOpenGLContext.cpp
|
|
cvfqtOpenGLWidget.cpp
|
|
cvfqtPerformanceInfoHud.cpp
|
|
cvfqtUtils.cpp
|
|
)
|
|
|
|
add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES})
|
|
|