Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CMake
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
André Pedro
CMake
Commits
36606b6d
Commit
36606b6d
authored
15 years ago
by
Clinton Stimpson
Browse files
Options
Downloads
Patches
Plain Diff
add support for finding qcollectiongenerator executable. fixes #9248.
parent
ecfca5d0
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
Modules/FindQt4.cmake
+17
-9
17 additions, 9 deletions
Modules/FindQt4.cmake
with
17 additions
and
9 deletions
Modules/FindQt4.cmake
+
17
−
9
View file @
36606b6d
...
...
@@ -247,14 +247,15 @@
# QT_QTSCRIPTTOOLS_LIBRARY The QtScriptTools library
#
# also defined, but NOT for general use are
# QT_MOC_EXECUTABLE Where to find the moc tool.
# QT_UIC_EXECUTABLE Where to find the uic tool.
# QT_UIC3_EXECUTABLE Where to find the uic3 tool.
# QT_RCC_EXECUTABLE Where to find the rcc tool
# QT_DBUSCPP2XML_EXECUTABLE Where to find the qdbuscpp2xml tool.
# QT_DBUSXML2CPP_EXECUTABLE Where to find the qdbusxml2cpp tool.
# QT_LUPDATE_EXECUTABLE Where to find the lupdate tool.
# QT_LRELEASE_EXECUTABLE Where to find the lrelease tool.
# QT_MOC_EXECUTABLE Where to find the moc tool.
# QT_UIC_EXECUTABLE Where to find the uic tool.
# QT_UIC3_EXECUTABLE Where to find the uic3 tool.
# QT_RCC_EXECUTABLE Where to find the rcc tool
# QT_DBUSCPP2XML_EXECUTABLE Where to find the qdbuscpp2xml tool.
# QT_DBUSXML2CPP_EXECUTABLE Where to find the qdbusxml2cpp tool.
# QT_LUPDATE_EXECUTABLE Where to find the lupdate tool.
# QT_LRELEASE_EXECUTABLE Where to find the lrelease tool.
# QT_QCOLLECTIONGENERATOR_EXECUTABLE Where to find the qcollectiongenerator tool.
#
#
# These are around for backwards compatibility
...
...
@@ -880,6 +881,7 @@ IF (QT4_QMAKE_FOUND)
SET
(
QT_DBUSXML2CPP_EXECUTABLE NOTFOUND
)
SET
(
QT_LUPDATE_EXECUTABLE NOTFOUND
)
SET
(
QT_LRELEASE_EXECUTABLE NOTFOUND
)
SET
(
QT_QCOLLECTIONGENERATOR_EXECUTABLE NOTFOUND
)
ENDIF
(
QT_QMAKE_CHANGED
)
FIND_PROGRAM
(
QT_MOC_EXECUTABLE
...
...
@@ -930,6 +932,12 @@ IF (QT4_QMAKE_FOUND)
NO_DEFAULT_PATH
)
FIND_PROGRAM
(
QT_QCOLLECTIONGENERATOR_EXECUTABLE
NAMES qcollectiongenerator-qt4 qcollectiongenerator
PATHS
${
QT_BINARY_DIR
}
NO_DEFAULT_PATH
)
IF
(
QT_MOC_EXECUTABLE
)
SET
(
QT_WRAP_CPP
"YES"
)
ENDIF
(
QT_MOC_EXECUTABLE
)
...
...
@@ -942,7 +950,7 @@ IF (QT4_QMAKE_FOUND)
MARK_AS_ADVANCED
(
QT_UIC_EXECUTABLE QT_UIC3_EXECUTABLE QT_MOC_EXECUTABLE
QT_RCC_EXECUTABLE QT_DBUSXML2CPP_EXECUTABLE QT_DBUSCPP2XML_EXECUTABLE
QT_LUPDATE_EXECUTABLE QT_LRELEASE_EXECUTABLE
)
QT_LUPDATE_EXECUTABLE QT_LRELEASE_EXECUTABLE
QT_QCOLLECTIONGENERATOR_EXECUTABLE
)
######################################
#
...
...
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