Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
Krita
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ashwin Dhakaita
Krita
Commits
e72b20c8
Commit
e72b20c8
authored
Jun 09, 2017
by
Scott Petrovic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix patching step so it runs on OSX when building Qt
parent
98c535e5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
3rdparty/ext_qt/CMakeLists.txt
3rdparty/ext_qt/CMakeLists.txt
+2
-2
No files found.
3rdparty/ext_qt/CMakeLists.txt
View file @
e72b20c8
...
...
@@ -130,7 +130,7 @@ else( APPLE )
# Fix Xcode xcrun related issue.
# NOTE: This should be fixed by Qt 5.7.1 see here: http://code.qt.io/cgit/qt/qtbase.git/commit/?h=dev&id=77a71c32c9d19b87f79b208929e71282e8d8b5d9
# NOTE: but no one's holding their breath.
set
(
ext_qt_PATCH_COMMAND $
$
{
PATCH_COMMAND
}
-p1 -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/gerrit-166202.diff
set
(
ext_qt_PATCH_COMMAND
${
PATCH_COMMAND
}
-p1 -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/gerrit-166202.diff
COMMAND
${
PATCH_COMMAND
}
-p1 -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/macdeploy-qt.diff
COMMAND
${
PATCH_COMMAND
}
-p1 -b -d <SOURCE_DIR>/qtbase -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/qtbase-configure.patch
COMMAND
${
PATCH_COMMAND
}
-p1 -b -d <SOURCE_DIR>/qtbase/mkspecs/features/mac -i
${
CMAKE_CURRENT_SOURCE_DIR
}
/mac-default.patch
)
...
...
@@ -149,7 +149,7 @@ else( APPLE )
if
(
NOT NUM_CORES EQUAL 0
)
if
(
NUM_CORES GREATER 2
)
# be nice...
MATH
(
EXPR NUM_CORES
"
${
NUM_CORES
}
- 2"
)
MATH
(
EXPR NUM_CORES
"
${
NUM_CORES
}
- 2"
)
endif
()
set
(
PARALLEL_MAKE
"make;-j
${
NUM_CORES
}
"
)
message
(
STATUS
"
${
EXTPREFIX_qt
}
:Parallelized make:
${
PARALLEL_MAKE
}
"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment