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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
David Youssefi
otb
Commits
6c99ef53
Commit
6c99ef53
authored
13 years ago
by
Julien Malik
Browse files
Options
Downloads
Patches
Plain Diff
COMP: missing WRAP_QT->OTB_WRAP_QT
parent
390b86d2
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
CMake/ImportGetText.cmake
+2
-2
2 additions, 2 deletions
CMake/ImportGetText.cmake
CMake/ImportQt4.cmake
+2
-2
2 additions, 2 deletions
CMake/ImportQt4.cmake
with
4 additions
and
4 deletions
CMake/ImportGetText.cmake
+
2
−
2
View file @
6c99ef53
...
...
@@ -38,7 +38,7 @@ IF(OTB_USE_GETTEXT)
MESSAGE
(
STATUS
" GetText intl library :
${
GETTEXT_INTL_LIBRARY
}
"
)
ENDIF
(
APPLE OR WIN32
)
IF
(
BUILD_APPLICATIONS AND WRAP_QT
)
IF
(
BUILD_APPLICATIONS AND
OTB_
WRAP_QT
)
# Check bug 419 : conflict between gettext and Qt on some Ubuntu systems
SET
(
CMAKE_REQUIRED_INCLUDES
"
${
QT_INCLUDES
}
"
)
SET
(
CMAKE_REQUIRED_LIBRARIES
"
${
QT_LIBRARIES
}
;
${
GETTEXT_LIBRARY
}
"
)
...
...
@@ -53,7 +53,7 @@ IF(OTB_USE_GETTEXT)
"Opening OTB-applications auto generated in QT may generate a crash.
\n
"
"You might consider deactivating the support of Gettext in OTB with the OTB_USE_GETTEXT cmake option.
\n
"
)
ENDIF
(
NOT CHECK_QT_GETTEXT_CONFLICT
)
ENDIF
(
BUILD_APPLICATIONS AND WRAP_QT
)
ENDIF
(
BUILD_APPLICATIONS AND
OTB_
WRAP_QT
)
ELSE
(
GETTEXT_FOUND
)
SET
(
OTB_I18N 0
)
...
...
This diff is collapsed.
Click to expand it.
CMake/ImportQt4.cmake
+
2
−
2
View file @
6c99ef53
MESSAGE
(
STATUS
"Importing Qt..."
)
IF
(
WRAP_QT
)
IF
(
OTB_
WRAP_QT
)
FIND_PACKAGE
(
Qt4 REQUIRED
)
SET
(
QT_USE_QTXML 1
)
INCLUDE
(
${
QT_USE_FILE
}
)
ENDIF
(
WRAP_QT
)
ENDIF
(
OTB_
WRAP_QT
)
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