Skip to content
Snippets Groups Projects
Commit 64b61ec0 authored by Guillaume Pasero's avatar Guillaume Pasero
Browse files

SuperBuild: fix QWT 6 superbuild

parent c57bf473
No related branches found
No related tags found
No related merge requests found
...@@ -62,21 +62,11 @@ ExternalProject_Add(QWT ...@@ -62,21 +62,11 @@ ExternalProject_Add(QWT
INSTALL_DIR ${SB_INSTALL_PREFIX} INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION} DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
DEPENDS ${QWT_DEPENDENCIES} DEPENDS ${QWT_DEPENDENCIES}
PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/patches/QWT/qwtconfig.pri ${QWT_SB_SRC} PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/qwtconfig.pri ${QWT_SB_SRC}
CONFIGURE_COMMAND CONFIGURE_COMMAND ${QWT_SB_CONFIGURE_PROGRAM} ${QWT_SB_SRC}/qwt.pro
${QWT_SB_CONFIGURE_PROGRAM} ${QWT_SB_SRC}/qwt.pro
BUILD_COMMAND ${QWT_SB_MAKE_PROGRAM} BUILD_COMMAND ${QWT_SB_MAKE_PROGRAM}
INSTALL_COMMAND ${QWT_SB_MAKE_PROGRAM} install INSTALL_ROOT=${SB_INSTALL_PREFIX} INSTALL_COMMAND ${QWT_SB_MAKE_PROGRAM} install
LOG_CONFIGURE 0 LOG_CONFIGURE 0
LOG_BUILD 0 LOG_BUILD 0
LOG_INSTALL 0 LOG_INSTALL 0
) )
#SUPERBUILD_PATCH_SOURCE(QWT)
# set(_SB_QWT_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
# if(WIN32)
# set(_SB_QWT_LIBRARY ${SB_INSTALL_PREFIX}/lib/qwt5.lib)
# elseif(UNIX)
# set(_SB_QWT_LIBRARY ${SB_INSTALL_PREFIX}/lib/libqwt${CMAKE_SHARED_LIBRARY_SUFFIX})
# endif()
...@@ -16,18 +16,7 @@ QWT_VERSION = $${QWT_VER_MAJ}.$${QWT_VER_MIN}.$${QWT_VER_PAT} ...@@ -16,18 +16,7 @@ QWT_VERSION = $${QWT_VER_MAJ}.$${QWT_VER_MIN}.$${QWT_VER_PAT}
# Install paths # Install paths
###################################################################### ######################################################################
#QWT_INSTALL_PREFIX = . QWT_INSTALL_PREFIX = @SB_INSTALL_PREFIX@
unix {
#QWT_INSTALL_PREFIX = @SB_INSTALL_PREFIX@
# QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION
}
win32 {
# QWT_INSTALL_PREFIX = @SB_INSTALL_PREFIX@
# QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
}
QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc
QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include
QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
...@@ -93,7 +82,7 @@ QWT_CONFIG += QwtWidgets ...@@ -93,7 +82,7 @@ QWT_CONFIG += QwtWidgets
# export a plot to a SVG document # export a plot to a SVG document
###################################################################### ######################################################################
QWT_CONFIG += QwtSvg #QWT_CONFIG += QwtSvg
###################################################################### ######################################################################
# If you want to use a OpenGL plot canvas # If you want to use a OpenGL plot canvas
...@@ -118,7 +107,7 @@ QWT_CONFIG += QwtOpenGL ...@@ -118,7 +107,7 @@ QWT_CONFIG += QwtOpenGL
# Otherwise you have to build it from the designer directory. # Otherwise you have to build it from the designer directory.
###################################################################### ######################################################################
QWT_CONFIG += QwtDesigner #QWT_CONFIG += QwtDesigner
###################################################################### ######################################################################
# Compile all Qwt classes into the designer plugin instead # Compile all Qwt classes into the designer plugin instead
...@@ -161,7 +150,7 @@ win32 { ...@@ -161,7 +150,7 @@ win32 {
macx:!static:CONFIG(qt_framework, qt_framework|qt_no_framework) { macx:!static:CONFIG(qt_framework, qt_framework|qt_no_framework) {
QWT_CONFIG += QwtFramework # QWT_CONFIG += QwtFramework
} }
###################################################################### ######################################################################
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment