Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sébastien Peillet
otb
Commits
64b61ec0
Commit
64b61ec0
authored
7 years ago
by
Guillaume Pasero
Browse files
Options
Downloads
Patches
Plain Diff
SuperBuild: fix QWT 6 superbuild
parent
c57bf473
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
SuperBuild/CMake/External_qwt.cmake
+3
-13
3 additions, 13 deletions
SuperBuild/CMake/External_qwt.cmake
SuperBuild/patches/QWT/qwtconfig.pri
+4
-15
4 additions, 15 deletions
SuperBuild/patches/QWT/qwtconfig.pri
with
7 additions
and
28 deletions
SuperBuild/CMake/External_qwt.cmake
+
3
−
13
View file @
64b61ec0
...
...
@@ -62,21 +62,11 @@ ExternalProject_Add(QWT
INSTALL_DIR
${
SB_INSTALL_PREFIX
}
DOWNLOAD_DIR
${
DOWNLOAD_LOCATION
}
DEPENDS
${
QWT_DEPENDENCIES
}
PATCH_COMMAND
${
CMAKE_COMMAND
}
-E copy
${
CMAKE_SOURCE_DIR
}
/patches/QWT/qwtconfig.pri
${
QWT_SB_SRC
}
CONFIGURE_COMMAND
${
QWT_SB_CONFIGURE_PROGRAM
}
${
QWT_SB_SRC
}
/qwt.pro
PATCH_COMMAND
${
CMAKE_COMMAND
}
-E copy
${
CMAKE_BINARY_DIR
}
/qwtconfig.pri
${
QWT_SB_SRC
}
CONFIGURE_COMMAND
${
QWT_SB_CONFIGURE_PROGRAM
}
${
QWT_SB_SRC
}
/qwt.pro
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_BUILD 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()
This diff is collapsed.
Click to expand it.
SuperBuild/patches/QWT/qwtconfig.pri
+
4
−
15
View file @
64b61ec0
...
...
@@ -16,18 +16,7 @@ QWT_VERSION = $${QWT_VER_MAJ}.$${QWT_VER_MIN}.$${QWT_VER_PAT}
# Install paths
######################################################################
#QWT_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_PREFIX = @SB_INSTALL_PREFIX@
QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc
QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include
QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
...
...
@@ -93,7 +82,7 @@ QWT_CONFIG += QwtWidgets
# export a plot to a SVG document
######################################################################
QWT_CONFIG += QwtSvg
#
QWT_CONFIG += QwtSvg
######################################################################
# If you want to use a OpenGL plot canvas
...
...
@@ -118,7 +107,7 @@ QWT_CONFIG += QwtOpenGL
# 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
...
...
@@ -161,7 +150,7 @@ win32 {
macx:!static:CONFIG(qt_framework, qt_framework|qt_no_framework) {
QWT_CONFIG += QwtFramework
#
QWT_CONFIG += QwtFramework
}
######################################################################
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment