properties-cpp

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

  1. remove-license-statement-in-build-files
  2. Merge into trunk
Proposed by Thomas Voß
Status: Merged
Approved by: Martin Pitt
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
Sebastien Bacher Approve
Ubuntu Phablet Team 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.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:8
http://jenkins.qa.ubuntu.com/job/properties-cpp-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/properties-cpp-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/properties-cpp-trusty-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/properties-cpp-trusty-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/properties-cpp-trusty-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/properties-cpp-ci/3/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-11-13 09:19:50 +0000
+++ CMakeLists.txt 2013-12-13 12:15:10 +0000
@@ -1,19 +1,3 @@
1# Copyright © 2013 Canonical Ltd.
2#
3# This program is free software: you can redistribute it and/or modify
4# it under the terms of the GNU General Public License version 3 as
5# published by the Free Software Foundation.
6#
7# This program is distributed in the hope that it will be useful,
8# but WITHOUT ANY WARRANTY; without even the implied warranty of
9# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10# GNU General Public License for more details.
11#
12# You should have received a copy of the GNU General Public License
13# along with this program. If not, see <http://www.gnu.org/licenses/>.
14#
15# Authored by: Thomas Voss <thomas.voss@canonical.com>
16
17cmake_minimum_required(VERSION 2.8)1cmake_minimum_required(VERSION 2.8)
182
19project(properties-cpp)3project(properties-cpp)
204
=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt 2013-11-13 09:19:50 +0000
+++ data/CMakeLists.txt 2013-12-13 12:15:10 +0000
@@ -1,19 +1,3 @@
1# Copyright © 2013 Canonical Ltd.
2#
3# This program is free software: you can redistribute it and/or modify
4# it under the terms of the GNU General Public License version 3 as
5# published by the Free Software Foundation.
6#
7# This program is distributed in the hope that it will be useful,
8# but WITHOUT ANY WARRANTY; without even the implied warranty of
9# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10# GNU General Public License for more details.
11#
12# You should have received a copy of the GNU General Public License
13# along with this program. If not, see <http://www.gnu.org/licenses/>.
14#
15# Authored by: Thomas Voss <thomas.voss@canonical.com>
16
17configure_file(1configure_file(
18 properties-cpp.pc.in properties-cpp.pc @ONLY2 properties-cpp.pc.in properties-cpp.pc @ONLY
19)3)
204
=== modified file 'doc/CMakeLists.txt'
--- doc/CMakeLists.txt 2013-11-13 09:19:50 +0000
+++ doc/CMakeLists.txt 2013-12-13 12:15:10 +0000
@@ -1,19 +1,3 @@
1# Copyright © 2013 Canonical Ltd.
2#
3# This program is free software: you can redistribute it and/or modify
4# it under the terms of the GNU General Public License version 3 as
5# published by the Free Software Foundation.
6#
7# This program is distributed in the hope that it will be useful,
8# but WITHOUT ANY WARRANTY; without even the implied warranty of
9# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10# GNU General Public License for more details.
11#
12# You should have received a copy of the GNU General Public License
13# along with this program. If not, see <http://www.gnu.org/licenses/>.
14#
15# Authored by: Thomas Voss <thomas.voss@canonical.com>
16
17option(1option(
18 PROPERTIES_CPP_ENABLE_DOC_GENERATION2 PROPERTIES_CPP_ENABLE_DOC_GENERATION
19 "Generate package documentation with doxygen"3 "Generate package documentation with doxygen"
204
=== modified file 'include/CMakeLists.txt'
--- include/CMakeLists.txt 2013-11-28 07:35:14 +0000
+++ include/CMakeLists.txt 2013-12-13 12:15:10 +0000
@@ -1,19 +1,3 @@
1# Copyright © 2013 Canonical Ltd.
2#
3# This program is free software: you can redistribute it and/or modify
4# it under the terms of the GNU General Public License version 3 as
5# published by the Free Software Foundation.
6#
7# This program is distributed in the hope that it will be useful,
8# but WITHOUT ANY WARRANTY; without even the implied warranty of
9# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10# GNU General Public License for more details.
11#
12# You should have received a copy of the GNU General Public License
13# along with this program. If not, see <http://www.gnu.org/licenses/>.
14#
15# Authored by: Thomas Voss <thomas.voss@canonical.com>
16
17install(1install(
18 DIRECTORY core2 DIRECTORY core
19 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/3 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/
204
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt 2013-11-13 09:19:50 +0000
+++ tests/CMakeLists.txt 2013-12-13 12:15:10 +0000
@@ -1,19 +1,3 @@
1# Copyright © 2013 Canonical Ltd.
2#
3# This program is free software: you can redistribute it and/or modify
4# it under the terms of the GNU General Public License version 3 as
5# published by the Free Software Foundation.
6#
7# This program is distributed in the hope that it will be useful,
8# but WITHOUT ANY WARRANTY; without even the implied warranty of
9# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10# GNU General Public License for more details.
11#
12# You should have received a copy of the GNU General Public License
13# along with this program. If not, see <http://www.gnu.org/licenses/>.
14#
15# Authored by: Thomas Voss <thomas.voss@canonical.com>
16
17set (OLD_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})1set (OLD_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
18# Don't treat warnings as errors in 3rd_party/{gmock,cucumber-cpp}2# Don't treat warnings as errors in 3rd_party/{gmock,cucumber-cpp}
19string (REPLACE " -Werror " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})3string (REPLACE " -Werror " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

Subscribers

People subscribed via source and target branches