Commit e0014fce authored by schultz's avatar schultz

Merge branch 'master' into fixCMakeFinders

parents cdc925a2 64ef6e27
...@@ -887,7 +887,7 @@ void Core::loadPlugin(const QString& _filename,const bool _silent, QString& _lic ...@@ -887,7 +887,7 @@ void Core::loadPlugin(const QString& _filename,const bool _silent, QString& _lic
} }
emit log(LOGOUT,tr("Plugin Desciption :\t %1 ").arg( basePlugin->description()) ); emit log(LOGOUT,tr("Plugin Description :\t %1 ").arg( basePlugin->description()) );
supported = "BaseInterface "; supported = "BaseInterface ";
......
...@@ -144,6 +144,7 @@ if (WIN32) ...@@ -144,6 +144,7 @@ if (WIN32)
-DUSEACG -DUSEACG
-DPLUGINLIBDLL -DPLUGINLIBDLL
-DUSEPLUGINLIBDLL -DUSEPLUGINLIBDLL
-DFREEGLUT_LIB_PRAGMAS=0
) )
endif () endif ()
......
This diff is collapsed.
...@@ -63,6 +63,7 @@ if (WIN32) ...@@ -63,6 +63,7 @@ if (WIN32)
-DPLUGINLIBDLL -DPLUGINLIBDLL
-DACGDLL -DACGDLL
-DUSEACG -DUSEACG
-DFREEGLUT_LIB_PRAGMAS=0
) )
endif () endif ()
......
...@@ -20,9 +20,9 @@ set( CMAKE_CXX_STANDARD 11 ) ...@@ -20,9 +20,9 @@ set( CMAKE_CXX_STANDARD 11 )
# ACG Environment default settings # ACG Environment default settings
# This is ugly but currently we need to work around the default installed 5.3 on debian # This is ugly but currently we need to work around the default installed 5.3 on debian
if ( EXISTS /ACG/acgdev/gcc-x86_64/qt-5.9.0/5.9/gcc_64/ ) if ( EXISTS /ACG/acgdev/gcc-x86_64/qt-5.10.1/5.10.1/gcc_64/ )
# Default to this install path for QT%_INSTALL_DIR # Default to this install path for QT%_INSTALL_DIR
set (QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.9.0/5.9/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment" ) set (QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.10.1/5.10.1/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment" )
endif() endif()
if ( WIN32 ) if ( WIN32 )
......
...@@ -37,6 +37,7 @@ find_path( EIGEN3_INCLUDE_DIR ...@@ -37,6 +37,7 @@ find_path( EIGEN3_INCLUDE_DIR
/usr/local/include /usr/local/include
/usr/local/include/eigen3/ /usr/local/include/eigen3/
/opt/local/include/eigen3/ /opt/local/include/eigen3/
"${CMAKE_WINDOWS_LIBS_DIR}/general/Eigen-3.3.4"
"${CMAKE_WINDOWS_LIBS_DIR}/general/Eigen-3.2.8" "${CMAKE_WINDOWS_LIBS_DIR}/general/Eigen-3.2.8"
"${CMAKE_WINDOWS_LIBS_DIR}/general/Eigen-3.2.6" "${CMAKE_WINDOWS_LIBS_DIR}/general/Eigen-3.2.6"
"${CMAKE_WINDOWS_LIBS_DIR}/Eigen-3.2.6" "${CMAKE_WINDOWS_LIBS_DIR}/Eigen-3.2.6"
......
...@@ -34,13 +34,15 @@ endif() ...@@ -34,13 +34,15 @@ endif()
if (QT5_FOUND) if (QT5_FOUND)
if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.10.1" ) if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.10.1" )
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.10.1") SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.10.1")
elseif (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.9.0" ) else()
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.9.0") if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.9.0" )
else() SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.9.0")
if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.8.0" OR ${Qt5Core_VERSION_STRING} VERSION_GREATER "5.5.1") else()
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.8.0") if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.8.0" OR ${Qt5Core_VERSION_STRING} VERSION_GREATER "5.5.1")
else() SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.8.0")
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1-qt5") else()
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1-qt5")
endif()
endif() endif()
endif() endif()
else() else()
......
...@@ -695,7 +695,7 @@ function (_build_openflipper_plugin plugin) ...@@ -695,7 +695,7 @@ function (_build_openflipper_plugin plugin)
# Visual studio requires our plugins to link with GLUT # Visual studio requires our plugins to link with GLUT
find_package (GLUT) find_package (GLUT)
# generate dllinport defines # generate dllinport defines
add_definitions (-DACGDLL -DUSEACG -DPLUGINLIBDLL -DUSEPLUGINLIBDLL) add_definitions (-DACGDLL -DUSEACG -DPLUGINLIBDLL -DUSEPLUGINLIBDLL -DFREEGLUT_LIB_PRAGMAS=0)
target_link_libraries (Plugin-${plugin} target_link_libraries (Plugin-${plugin}
${OPENMESH_LIBRARIES} ${OPENMESH_LIBRARIES}
ACG ACG
......
...@@ -29,6 +29,7 @@ if (WIN32) ...@@ -29,6 +29,7 @@ if (WIN32)
-DBUILDOBJECTTYPEDLL -DBUILDOBJECTTYPEDLL
-DACGDLL -DACGDLL
-DUSEACG -DUSEACG
-DFREEGLUT_LIB_PRAGMAS=0
) )
endif () endif ()
......
...@@ -48,11 +48,14 @@ ...@@ -48,11 +48,14 @@
\*===========================================================================*/ \*===========================================================================*/
#include "glew_wrappers.hh" #include "glew_wrappers.hh"
#include <OpenFlipper/common/GlobalOptions.hh>
#include <GL/glew.h> #include <GL/glew.h>
#include <stdio.h> #include <stdio.h>
DLLEXPORT void initGlew() { DLLEXPORT void initGlew() {
if (OpenFlipper::Options::glVersion().first >= 3 && OpenFlipper::Options::glVersion().second >= 2 && OpenFlipper::Options::coreProfile())
glewExperimental = GL_TRUE;
GLenum err = glewInit(); GLenum err = glewInit();
if (GLEW_OK != err) if (GLEW_OK != err)
{ {
......
...@@ -73,7 +73,6 @@ include_directories ( ...@@ -73,7 +73,6 @@ include_directories (
link_directories ( link_directories (
${GLEW_LIBRARY_DIR} ${GLEW_LIBRARY_DIR}
${GLUT_LIBRARY_DIR}
) )
#=================================================================== #===================================================================
...@@ -101,7 +100,7 @@ set (directories ...@@ -101,7 +100,7 @@ set (directories
# generate dllexport macros on windows # generate dllexport macros on windows
if (WIN32) if (WIN32)
add_definitions(-DACGDLL) add_definitions(-DACGDLL -DFREEGLUT_LIB_PRAGMAS=0)
remove_definitions(-DUSEACG) remove_definitions(-DUSEACG)
endif () endif ()
......
...@@ -153,7 +153,7 @@ glViewer::glViewer( QGraphicsScene* _scene, ...@@ -153,7 +153,7 @@ glViewer::glViewer( QGraphicsScene* _scene,
createWidgets(); createWidgets();
// bind GL context to GL state class // bind GL context to GL state class
glstate_ = new ACG::GLState(true, _glWidget->format().profile() == OFGLFormat::CompatibilityProfile); glstate_ = new ACG::GLState(true, _glWidget->format().profile() != OFGLFormat::CoreProfile);
properties_.setglState( glstate_ ); properties_.setglState( glstate_ );
......
...@@ -129,7 +129,7 @@ LoggerWidget::LoggerWidget( QWidget *parent) ...@@ -129,7 +129,7 @@ LoggerWidget::LoggerWidget( QWidget *parent)
allButton_ = new QPushButton(QIcon(path + "status_all.png"),tr("All Messages")); allButton_ = new QPushButton(QIcon(path + "status_all.png"),tr("All Messages"));
allButton_->setCheckable(true); allButton_->setCheckable(true);
allButton_->setAutoExclusive(true); allButton_->setAutoExclusive(true);
infoButton_ = new QPushButton(QIcon(path + "status_green.png"),tr("Informations")); infoButton_ = new QPushButton(QIcon(path + "status_green.png"),tr("Information"));
infoButton_->setCheckable(true); infoButton_->setCheckable(true);
infoButton_->setAutoExclusive(true); infoButton_->setAutoExclusive(true);
warnButton_ = new QPushButton(QIcon(path + "status_yellow.png"),tr("Warnings")); warnButton_ = new QPushButton(QIcon(path + "status_yellow.png"),tr("Warnings"));
......
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