Midori Web Browser

Merge lp:~tuxator/midori/build-order into lp:midori

  1. build-order
  2. Merge into trunk
Proposed by Paweł Forysiuk
Status: Merged
Approved by: Cris Dywan
Approved revision: 6570
Merged at revision: 6570
Proposed branch: lp:~tuxator/midori/build-order
Merge into: lp:midori
Diff against target: 20 lines (+3/-3)
1 file modified
CMakeLists.txt (+3/-3)
To merge this branch: bzr merge lp:~tuxator/midori/build-order
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+208249@code.launchpad.net

Commit message

Make cmake build code before processing data and translations

To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) wrote :

FYI if you add -j argument to make command it will utilize all your processor cores

Revision history for this message
Cody Garver (codygarver) wrote :

Just saying that because I assume this merge is about speeding the build process up or something

Revision history for this message
Cris Dywan (kalikiana) wrote :

Fwiw to actually make it fast, use ninja, not make. But I think the point of it is that all folders aren't independent so order has an impact.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-02-18 21:15:56 +0000
3+++ CMakeLists.txt 2014-02-25 23:42:08 +0000
4@@ -277,13 +277,13 @@
5 install(FILES AUTHORS COPYING ChangeLog EXPAT README DESTINATION ${CMAKE_INSTALL_DOCDIR})
6
7 add_subdirectory (midori)
8+add_subdirectory (extensions)
9+enable_testing()
10+add_subdirectory (tests)
11 add_subdirectory (po)
12 add_subdirectory (icons)
13 add_subdirectory (data)
14 add_subdirectory (config)
15-enable_testing()
16-add_subdirectory (tests)
17-add_subdirectory (extensions)
18
19 if (USE_APIDOCS)
20 add_subdirectory (docs/api)

Subscribers

People subscribed via source and target branches

to all changes: