Skip to content

Commit ccf6ab2

Browse files
lawrinlawrin
lawrin
authored and
lawrin
committed
Merge results.
2 parents a4471bb + 39494ba commit ccf6ab2

File tree

7 files changed

+2905
-372
lines changed

7 files changed

+2905
-372
lines changed

‎CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,13 @@ IF(WIN32)
252252
SET( LICENSE_FILENAME "${CPACK_RESOURCE_FILE_LICENSE}")")
253253
ENDIF(WIN32)
254254

255-
INSTALL(FILES ${CPACK_RESOURCE_FILE_README} ${CPACK_RESOURCE_FILE_INSTALL} ${CPACK_RESOURCE_FILE_LICENSE} "${CMAKE_SOURCE_DIR}/ANNOUNCEMENT" DESTINATION "." OPTIONAL)
255+
INSTALL(FILES
256+
${CPACK_RESOURCE_FILE_README}
257+
${CPACK_RESOURCE_FILE_INSTALL}
258+
${CPACK_RESOURCE_FILE_LICENSE}
259+
"${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt"
260+
"${CMAKE_SOURCE_DIR}/ANNOUNCEMENT"
261+
DESTINATION "." OPTIONAL)
256262

257263
SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
258264
".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"

‎COPYING

Lines changed: 68 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GNU GENERAL PUBLIC LICENSE
1+
GNU GENERAL PUBLIC LICENSE
22
Version 2, June 1991
33

44
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
@@ -36,13 +36,16 @@ you have. You must make sure that they, too, receive or can get the
3636
source code. And you must show them these terms so they know their
3737
rights.
3838

39-
We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the
40-
software.
39+
We protect your rights with two steps: (1) copyright the software, and
40+
(2) offer you this license which gives you legal permission to copy,
41+
distribute and/or modify the software.
4142

4243
Also, for each author's protection and ours, we want to make certain
4344
that everyone understands that there is no warranty for this free
44-
software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems
45-
introduced by others will not reflect on the original authors' reputations.
45+
software. If the software is modified by someone else and passed on, we
46+
want its recipients to know that what they have is not the original, so
47+
that any problems introduced by others will not reflect on the original
48+
authors' reputations.
4649

4750
Finally, any free program is threatened constantly by software
4851
patents. We wish to avoid the danger that redistributors of a free
@@ -134,8 +137,7 @@ Sections 1 and 2 above provided that you also do one of the following:
134137

135138
a) Accompany it with the complete corresponding machine-readable
136139
source code, which must be distributed under the terms of Sections
137-
1 and 2 above on a medium customarily used for software
138-
interchange; or,
140+
1 and 2 above on a medium customarily used for software interchange; or,
139141

140142
b) Accompany it with a written offer, valid for at least three
141143
years, to give any third party, for a charge no more than your
@@ -154,8 +156,8 @@ The source code for a work means the preferred form of the work for
154156
making modifications to it. For an executable work, complete source
155157
code means all the source code for all modules it contains, plus any
156158
associated interface definition files, plus the scripts used to
157-
control compilation and installation of the executable. However, as
158-
a special exception, the source code distributed need not include
159+
control compilation and installation of the executable. However, as a
160+
special exception, the source code distributed need not include
159161
anything that is normally distributed (in either source or binary
160162
form) with the major components (compiler, kernel, and so on) of the
161163
operating system on which the executable runs, unless that component
@@ -232,30 +234,48 @@ those countries, so that distribution is permitted only in or among
232234
countries not thus excluded. In such case, this License incorporates
233235
the limitation as if written in the body of this License.
234236

235-
9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to
236-
the present version, but may differ in detail to address new problems or concerns.
237+
9. The Free Software Foundation may publish revised and/or new versions
238+
of the General Public License from time to time. Such new versions will
239+
be similar in spirit to the present version, but may differ in detail to
240+
address new problems or concerns.
237241

238242
Each version is given a distinguishing version number. If the Program
239-
specifies a version number of this License which applies to it and
240-
"any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If
241-
the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
243+
specifies a version number of this License which applies to it and "any
244+
later version", you have the option of following the terms and conditions
245+
either of that version or of any later version published by the Free
246+
Software Foundation. If the Program does not specify a version number of
247+
this License, you may choose any version ever published by the Free Software
248+
Foundation.
242249

243250
10. If you wish to incorporate parts of the Program into other free
244-
programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write
245-
to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of
246-
our free software and of promoting the sharing and reuse of software generally.
251+
programs whose distribution conditions are different, write to the author
252+
to ask for permission. For software which is copyrighted by the Free
253+
Software Foundation, write to the Free Software Foundation; we sometimes
254+
make exceptions for this. Our decision will be guided by the two goals
255+
of preserving the free status of all derivatives of our free software and
256+
of promoting the sharing and reuse of software generally.
247257

248258
NO WARRANTY
249259

250-
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN
251-
WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
252-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
253-
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
254-
255-
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS
256-
PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
257-
(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY
258-
OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
260+
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
261+
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
262+
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
263+
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
264+
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
265+
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
266+
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
267+
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
268+
REPAIR OR CORRECTION.
269+
270+
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
271+
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
272+
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
273+
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
274+
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
275+
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
276+
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
277+
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
278+
POSSIBILITY OF SUCH DAMAGES.
259279

260280
END OF TERMS AND CONDITIONS
261281

@@ -270,52 +290,50 @@ to attach them to the start of each source file to most effectively
270290
convey the exclusion of warranty; and each file should have at least
271291
the "copyright" line and a pointer to where the full notice is found.
272292

273-
<one line to give the program's name and a brief idea of what it
274-
does.>
293+
<one line to give the program's name and a brief idea of what it does.>
275294
Copyright (C) <year> <name of author>
276295

277-
This program is free software; you can redistribute it and/or
278-
modify it under the terms of the GNU General Public License as
279-
published by the Free Software Foundation; either version
280-
2 of the License, or (at your option) any later version.
296+
This program is free software; you can redistribute it and/or modify
297+
it under the terms of the GNU General Public License as published by
298+
the Free Software Foundation; either version 2 of the License, or
299+
(at your option) any later version.
281300

282301
This program is distributed in the hope that it will be useful,
283302
but WITHOUT ANY WARRANTY; without even the implied warranty of
284303
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
285304
GNU General Public License for more details.
286305

287-
You should have received a copy of the GNU General Public License
288-
along with this program; if not, write to the Free Software
289-
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
290-
02110-1301 USA.
306+
You should have received a copy of the GNU General Public License along
307+
with this program; if not, write to the Free Software Foundation, Inc.,
308+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
291309

292310
Also add information on how to contact you by electronic and paper mail.
293311

294312
If the program is interactive, make it output a short notice like this
295313
when it starts in an interactive mode:
296314

297315
Gnomovision version 69, Copyright (C) year name of author
298-
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
299-
type 'show w'. This is free software, and you are welcome
300-
to redistribute it under certain conditions; type 'show c'
301-
for details.
316+
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
317+
This is free software, and you are welcome to redistribute it
318+
under certain conditions; type `show c' for details.
302319

303-
The hypothetical commands 'show w' and 'show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something
304-
other than 'show w' and
305-
'show c'; they could even be mouse-clicks or menu items--whatever
306-
suits your program.
320+
The hypothetical commands `show w' and `show c' should show the appropriate
321+
parts of the General Public License. Of course, the commands you use may
322+
be called something other than `show w' and `show c'; they could even be
323+
mouse-clicks or menu items--whatever suits your program.
307324

308325
You should also get your employer (if you work as a programmer) or your
309326
school, if any, to sign a "copyright disclaimer" for the program, if
310327
necessary. Here is a sample; alter the names:
311328

312-
Yoyodyne, Inc., hereby disclaims all copyright interest in the
313-
program 'Gnomovision' (which makes passes at compilers) written
314-
by James Hacker.
329+
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
330+
`Gnomovision' (which makes passes at compilers) written by James Hacker.
315331

316332
<signature of Ty Coon>, 1 April 1989
317333
Ty Coon, President of Vice
318334

319-
This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful
320-
to permit linking proprietary applications with the library. If this is what you want to do, use
321-
the GNU Lesser General Public License instead of this License.
335+
This General Public License does not permit incorporating your program into
336+
proprietary programs. If your program is a subroutine library, you may
337+
consider it more useful to permit linking proprietary applications with the
338+
library. If this is what you want to do, use the GNU Lesser General
339+
Public License instead of this License.

0 commit comments

Comments
 (0)