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
Antoine Belvire
otb
Commits
f1ef8fe9
Commit
f1ef8fe9
authored
10 years ago
by
Guillaume Pasero
Browse files
Options
Downloads
Patches
Plain Diff
COMP: fix QT4 config for OTB
parent
0f0b5f7c
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
CMake/External_OTB.cmake
+5
-6
5 additions, 6 deletions
CMake/External_OTB.cmake
with
5 additions
and
6 deletions
CMake/External_OTB.cmake
+
5
−
6
View file @
f1ef8fe9
...
...
@@ -22,19 +22,19 @@ endif()
if
(
ENABLE_QT4
)
if
(
USE_SYSTEM_QT4
)
set
(
OTB_
SB_WRAP_QT_CONFIG -DOTB_
USE_QT4
:BOOL=
ON
)
set
(
OTB_USE_QT4
ON
)
else
()
if
(
MSVC
)
set
(
OTB_
SB_WRAP_QT_CONFIG -DOTB_
USE_QT4
:BOOL=
ON
)
set
(
OTB_USE_QT4
ON
)
list
(
APPEND
${
proj
}
_DEPENDENCIES QT4
)
else
(
UNIX
)
#TODO: use must have Qt4
message
(
STATUS
" Qt4 is not built by SuperBuild. You need to install it via package manager."
)
set
(
OTB_
SB_WRAP_QT_CONFIG -DOTB_
USE_QT4
:BOOL=
OFF
)
set
(
OTB_USE_QT4
OFF
)
endif
()
endif
()
else
()
set
(
OTB_
SB_WRAP_QT_CONFIG -DOTB_
USE_QT4
:BOOL=
OFF
)
set
(
OTB_USE_QT4
OFF
)
endif
()
if
(
USE_SYSTEM_GDAL
)
...
...
@@ -174,9 +174,8 @@ ExternalProject_Add(${proj}
-DOTB_USE_MUPARSER:BOOL=ON
-DOTB_USE_MUPARSERX:BOOL=ON
-DOTB_USE_OPENCV:BOOL=ON
-DOTB_USE_QT4:BOOL=
ON
-DOTB_USE_QT4:BOOL=
${
OTB_USE_QT4
}
-DOTB_USE_SIFTFAST:BOOL=ON
${
OTB_SB_WRAP_QT_CONFIG
}
${
OTB_SB_ITK_CONFIG
}
${
OTB_SB_LIBKML_CONFIG
}
${
OTB_SB_OPENCV_CONFIG
}
...
...
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