Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
Calamares
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
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
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
osak
Calamares
Commits
e9d7e3ec
Commit
e9d7e3ec
authored
11 years ago
by
Aurélien Gâteau
Browse files
Options
Downloads
Patches
Plain Diff
Use Qt5 cmake macros
The qt_* macros have a different signature
parent
f4c5b904
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
CalamaresAddLibrary.cmake
+2
-2
2 additions, 2 deletions
CalamaresAddLibrary.cmake
with
2 additions
and
2 deletions
CalamaresAddLibrary.cmake
+
2
−
2
View file @
e9d7e3ec
...
...
@@ -25,13 +25,13 @@ function(calamares_add_library)
include_directories
(
${
CMAKE_CURRENT_BINARY_DIR
}
)
if
(
LIBRARY_UI
)
qt_wrap_ui
(
LIBRARY_UI_SOURCES
${
LIBRARY_UI
}
)
qt
5
_wrap_ui
(
LIBRARY_UI_SOURCES
${
LIBRARY_UI
}
)
list
(
APPEND LIBRARY_SOURCES
${
LIBRARY_UI_SOURCES
}
)
endif
()
# add resources from current dir
if
(
EXISTS
"
${
CMAKE_CURRENT_LIST_DIR
}
/resources.qrc"
)
qt_add_resources
(
LIBRARY_RC_SOURCES
"resources.qrc"
)
qt
5
_add_resources
(
LIBRARY_RC_SOURCES
"resources.qrc"
)
list
(
APPEND LIBRARY_SOURCES
${
LIBRARY_RC_SOURCES
}
)
unset
(
LIBRARY_RC_SOURCES
)
endif
()
...
...
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