Merge lp://staging/~gary-wzl77/holidays/arch_and_shadow_build into lp://staging/holidays
Proposed by
Gary.Wang
| Status: | Merged |
|---|---|
| Approved by: | Kyle Nitzsche |
| Approved revision: | 47 |
| Merged at revision: | 47 |
| Proposed branch: | lp://staging/~gary-wzl77/holidays/arch_and_shadow_build |
| Merge into: | lp://staging/holidays |
| Diff against target: |
71 lines (+17/-12) 2 files modified
CMakeLists.txt (+16/-11) manifest.json.in (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~gary-wzl77/holidays/arch_and_shadow_build |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Kyle Nitzsche | Pending | ||
|
Review via email:
|
|||
Commit message
1.detect arch when cmake to make sure click package name correct.
2.do not generate file in build-in source folder when shadow build.
Description of the change
1.detect arch when cmake to make sure click package name correct.
2.do not generate file in build-in source folder when shadow build.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
