Merge lp:~harp37/writer/CMake into lp:writer

Proposed by Anthony Huben
Status: Merged
Merged at revision: 76
Proposed branch: lp:~harp37/writer/CMake
Merge into: lp:writer
Diff against target: 38 lines (+4/-3)
3 files modified
CMakeLists.txt (+1/-0)
INSTALL (+1/-1)
src/config.vala (+2/-2)
To merge this branch: bzr merge lp:~harp37/writer/CMake
Reviewer Review Type Date Requested Status
Anthony Huben Approve
Review via email: mp+255232@code.launchpad.net

Description of the change

It works for the most part!!! Yes!

To post a comment you must log in.
Revision history for this message
Anthony Huben (harp37) :
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-11-25 00:55:20 +0000
3+++ CMakeLists.txt 2015-04-04 22:50:14 +0000
4@@ -51,6 +51,7 @@
5
6 include(ValaPrecompile)
7 vala_precompile(VALA_C
8+ BugFixAchive.vala
9 src/Utils/Document.vala
10 src/Utils/FileChooser.vala
11 src/Utils/Stylesheet.vala
12
13=== modified file 'INSTALL'
14--- INSTALL 2014-11-25 00:55:20 +0000
15+++ INSTALL 2015-04-04 22:50:14 +0000
16@@ -7,7 +7,7 @@
17 bzr branch lp:writer
18 cd writer
19 mkdir install; cd install
20- cmake .. -DCMAKE_INSTALL_PREFIX=/usr
21+ cmake .. -DCMAKE_INSTALL_PREFIX=/usr./
22 make
23 ./writer
24
25
26=== added file 'src/Utils/BugFixAchive.vala'
27=== modified file 'src/config.vala'
28--- src/config.vala 2014-09-13 14:29:31 +0000
29+++ src/config.vala 2015-04-04 22:50:14 +0000
30@@ -1,6 +1,6 @@
31 namespace Constants {
32- public const string DATADIR = "/usr/share";
33- public const string PKGDATADIR = "/usr/share/writer";
34+ public const string DATADIR = "/usr./share";
35+ public const string PKGDATADIR = "/usr./share/writer";
36 public const string GETTEXT_PACKAGE = "writer";
37 public const string RELEASE_NAME = "Writer";
38 public const string VERSION = "0.1";

Subscribers

People subscribed via source and target branches

to all changes: