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
1a26576b
Commit
1a26576b
authored
8 years ago
by
Rashad Kanavath
Browse files
Options
Downloads
Patches
Plain Diff
SuperBuild: QT4: check if any gtk dependencies are used from superbuild
parent
ddbe9e7d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
SuperBuild/CMake/External_qt4.cmake
+12
-0
12 additions, 0 deletions
SuperBuild/CMake/External_qt4.cmake
with
12 additions
and
0 deletions
SuperBuild/CMake/External_qt4.cmake
+
12
−
0
View file @
1a26576b
...
...
@@ -35,6 +35,14 @@ if(UNIX)
else
()
#Linux
if
(
QT4_SB_ENABLE_GTK
)
message
(
STATUS
"QT4_SB_ENABLE_GTK is activated. QT4 build includes gtk+ and libfreetype, libpng (dependencies of gtk+ package)"
)
if
(
NOT USE_SYSTEM_PNG OR
NOT USE_SYSTEM_EXPAT OR
NOT USE_SYSTEM_FREETYPE
)
message
(
FATAL_ERROR
"cannot use libpng, expat and freetype from superbuild when QT4_SB_ENABLE_GTK is ON.
eactivate gtk+ theme support in Qt build with 'cmake -DQT4_SB_ENABLE_GTK=OFF'
OR use system libraries for png, expat and freetype with
'cmake -DUSE_SYSTEM_PNG=ON -DUSE_SYSTEM_EXPAT USE_SYSTEM_FREETYPE=ON'"
)
endif
()
set
(
QT4_SB_CONFIG
"
${
QT4_SB_CONFIG
}
-sm -xrender -xrandr -gtkstyle"
)
else
()
set
(
QT4_SB_CONFIG
"
${
QT4_SB_CONFIG
}
-no-gtkstyle"
)
...
...
@@ -64,6 +72,10 @@ else()
set
(
QT4_CONFIGURE_COMMAND_IN
${
CMAKE_SOURCE_DIR
}
/patches/QT4/configure_qt4.sh.in
)
endif
()
if
(
EXISTS
"
${
QT4_CONFIGURE_COMMAND
}
"
)
execute_process
(
COMMAND
${
CMAKE_COMMAND
}
-E remove -f
"
${
QT4_CONFIGURE_COMMAND
}
"
)
endif
()
configure_file
(
${
QT4_CONFIGURE_COMMAND_IN
}
${
QT4_CONFIGURE_COMMAND
}
@ONLY
)
#Remove left over or previous installation from install prefix.
...
...
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