Merge lp:~thomas-voss/properties-cpp/remove-license-statement-in-build-files into lp:properties-cpp

Proposed by Thomas Voß on 2013-12-13
Status: Merged
Approved by: Martin Pitt on 2013-12-13
Approved revision: 8
Merged at revision: 8
Proposed branch: lp:~thomas-voss/properties-cpp/remove-license-statement-in-build-files
Merge into: lp:properties-cpp
Diff against target: 119 lines (+0/-80)
5 files modified
CMakeLists.txt (+0/-16)
data/CMakeLists.txt (+0/-16)
doc/CMakeLists.txt (+0/-16)
include/CMakeLists.txt (+0/-16)
tests/CMakeLists.txt (+0/-16)
To merge this branch: bzr merge lp:~thomas-voss/properties-cpp/remove-license-statement-in-build-files
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2013-12-13
Sebastien Bacher Approve on 2013-12-13
Ubuntu Phablet Team 2013-12-13 Pending
Review via email: mp+198927@code.launchpad.net

Commit message

Removed license statements from build files.

Description of the change

Removed license statements from build files.

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 2013-11-13 09:19:50 +0000
3+++ CMakeLists.txt 2013-12-13 12:15:10 +0000
4@@ -1,19 +1,3 @@
5-# Copyright © 2013 Canonical Ltd.
6-#
7-# This program is free software: you can redistribute it and/or modify
8-# it under the terms of the GNU General Public License version 3 as
9-# published by the Free Software Foundation.
10-#
11-# This program is distributed in the hope that it will be useful,
12-# but WITHOUT ANY WARRANTY; without even the implied warranty of
13-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-# GNU General Public License for more details.
15-#
16-# You should have received a copy of the GNU General Public License
17-# along with this program. If not, see <http://www.gnu.org/licenses/>.
18-#
19-# Authored by: Thomas Voss <thomas.voss@canonical.com>
20-
21 cmake_minimum_required(VERSION 2.8)
22
23 project(properties-cpp)
24
25=== modified file 'data/CMakeLists.txt'
26--- data/CMakeLists.txt 2013-11-13 09:19:50 +0000
27+++ data/CMakeLists.txt 2013-12-13 12:15:10 +0000
28@@ -1,19 +1,3 @@
29-# Copyright © 2013 Canonical Ltd.
30-#
31-# This program is free software: you can redistribute it and/or modify
32-# it under the terms of the GNU General Public License version 3 as
33-# published by the Free Software Foundation.
34-#
35-# This program is distributed in the hope that it will be useful,
36-# but WITHOUT ANY WARRANTY; without even the implied warranty of
37-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
38-# GNU General Public License for more details.
39-#
40-# You should have received a copy of the GNU General Public License
41-# along with this program. If not, see <http://www.gnu.org/licenses/>.
42-#
43-# Authored by: Thomas Voss <thomas.voss@canonical.com>
44-
45 configure_file(
46 properties-cpp.pc.in properties-cpp.pc @ONLY
47 )
48
49=== modified file 'doc/CMakeLists.txt'
50--- doc/CMakeLists.txt 2013-11-13 09:19:50 +0000
51+++ doc/CMakeLists.txt 2013-12-13 12:15:10 +0000
52@@ -1,19 +1,3 @@
53-# Copyright © 2013 Canonical Ltd.
54-#
55-# This program is free software: you can redistribute it and/or modify
56-# it under the terms of the GNU General Public License version 3 as
57-# published by the Free Software Foundation.
58-#
59-# This program is distributed in the hope that it will be useful,
60-# but WITHOUT ANY WARRANTY; without even the implied warranty of
61-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
62-# GNU General Public License for more details.
63-#
64-# You should have received a copy of the GNU General Public License
65-# along with this program. If not, see <http://www.gnu.org/licenses/>.
66-#
67-# Authored by: Thomas Voss <thomas.voss@canonical.com>
68-
69 option(
70 PROPERTIES_CPP_ENABLE_DOC_GENERATION
71 "Generate package documentation with doxygen"
72
73=== modified file 'include/CMakeLists.txt'
74--- include/CMakeLists.txt 2013-11-28 07:35:14 +0000
75+++ include/CMakeLists.txt 2013-12-13 12:15:10 +0000
76@@ -1,19 +1,3 @@
77-# Copyright © 2013 Canonical Ltd.
78-#
79-# This program is free software: you can redistribute it and/or modify
80-# it under the terms of the GNU General Public License version 3 as
81-# published by the Free Software Foundation.
82-#
83-# This program is distributed in the hope that it will be useful,
84-# but WITHOUT ANY WARRANTY; without even the implied warranty of
85-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
86-# GNU General Public License for more details.
87-#
88-# You should have received a copy of the GNU General Public License
89-# along with this program. If not, see <http://www.gnu.org/licenses/>.
90-#
91-# Authored by: Thomas Voss <thomas.voss@canonical.com>
92-
93 install(
94 DIRECTORY core
95 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/
96
97=== modified file 'tests/CMakeLists.txt'
98--- tests/CMakeLists.txt 2013-11-13 09:19:50 +0000
99+++ tests/CMakeLists.txt 2013-12-13 12:15:10 +0000
100@@ -1,19 +1,3 @@
101-# Copyright © 2013 Canonical Ltd.
102-#
103-# This program is free software: you can redistribute it and/or modify
104-# it under the terms of the GNU General Public License version 3 as
105-# published by the Free Software Foundation.
106-#
107-# This program is distributed in the hope that it will be useful,
108-# but WITHOUT ANY WARRANTY; without even the implied warranty of
109-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
110-# GNU General Public License for more details.
111-#
112-# You should have received a copy of the GNU General Public License
113-# along with this program. If not, see <http://www.gnu.org/licenses/>.
114-#
115-# Authored by: Thomas Voss <thomas.voss@canonical.com>
116-
117 set (OLD_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
118 # Don't treat warnings as errors in 3rd_party/{gmock,cucumber-cpp}
119 string (REPLACE " -Werror " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

Subscribers

People subscribed via source and target branches