Commit 9629cb8c authored by Isaak Lim's avatar Isaak Lim

added a Qwt6 finder, which is required for QT5 and adjusted plugins accordingly

refs #1753

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17639 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 9d06a392
include(plugin) include(plugin)
find_package(Qwt5)
if (EXISTS ${CMAKE_SOURCE_DIR}/ObjectTypes/PolyhedralMesh) if (EXISTS ${CMAKE_SOURCE_DIR}/ObjectTypes/PolyhedralMesh)
add_definitions (-DENABLE_OPENVOLUMEMESH_SUPPORT) add_definitions (-DENABLE_OPENVOLUMEMESH_SUPPORT)
add_definitions (-DENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT) add_definitions (-DENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT)
...@@ -12,19 +10,23 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/ObjectTypes/HexahedralMesh) ...@@ -12,19 +10,23 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/ObjectTypes/HexahedralMesh)
add_definitions (-DENABLE_OPENVOLUMEMESH_HEXAHEDRAL_SUPPORT) add_definitions (-DENABLE_OPENVOLUMEMESH_HEXAHEDRAL_SUPPORT)
endif() endif()
if(Qwt5_Qt4_FOUND) # use Qwt6 for QT5
add_definitions(-DWITH_QWT) if (NOT FORCE_QT4 AND QT5_FOUND)
openflipper_plugin(INCDIRS ${Qwt5_INCLUDE_DIR} LIBRARIES ${Qwt5_Qt4_LIBRARY}) find_package(Qwt6)
if (QWT6_FOUND)
add_definitions(-DWITH_QWT)
openflipper_plugin(INCDIRS ${QWT6_INCLUDE_DIRS} LIBRARIES ${QWT6_LIBRARIES})
else()
openflipper_plugin()
endif()
else() else()
openflipper_plugin() find_package(Qwt5)
if(Qwt5_Qt4_FOUND)
add_definitions(-DWITH_QWT)
openflipper_plugin(INCDIRS ${Qwt5_INCLUDE_DIR} LIBRARIES ${Qwt5_Qt4_LIBRARY})
else()
openflipper_plugin()
endif()
endif() endif()
...@@ -72,6 +72,8 @@ ...@@ -72,6 +72,8 @@
#include <qwt_scale_engine.h> #include <qwt_scale_engine.h>
#include <qwt_plot_marker.h> #include <qwt_plot_marker.h>
#include <QDialog>
// qmake users have to include pc // qmake users have to include pc
#include <ui_QwtFunctionPlotBase.hh> #include <ui_QwtFunctionPlotBase.hh>
......
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