Skip to content

Commit

Permalink
Merge pull request #578 from schuhschuh/fix-download-and-installation…
Browse files Browse the repository at this point in the history 
…-instructions

Fix download and installation instructions
  • Loading branch information
@schuhschuh
schuhschuh committed Apr 18, 2016
2 parents fde5b86 + e013081 commit 3a8d4b6
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 217 deletions.
175 changes: 1 addition & 174 deletions COPYING.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ CMake BASIS License

Copyright (c) 2011-2012 University of Pennsylvania
Copyright (c) 2013-2014 Carnegie Mellon University
Copyright (c) 2013-2014 Andreas Schuh
Copyright (c) 2013-2016 Andreas Schuh
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand All @@ -25,179 +25,6 @@ CMake BASIS License
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.



SBIA Contribution and Software License Agreement ("Agreement")
==============================================================

Version 1.0 (June 9, 2011)

This Agreement covers contributions to and downloads from Software maintained by
the Section of Biomedical Image Analysis, Department of Radiology at the University
of Pennsylvania ("SBIA"). Part A of this Agreement applies to contributions of
software and/or data to the Software (including making revisions of or additions
to code and/or data already in this Software). Part B of this Agreement applies to
downloads of software and/or data from SBIA. Part C of this Agreement applies to
all transactions with SBIA. If you distribute Software (as defined below) downloaded
from SBIA, all of the paragraphs of Part B of this Agreement must be included with
and apply to such Software.

Your contribution of software and/or data to SBIA (including prior to the date
of the first publication of this Agreement, each a "Contribution") and/or
downloading, copying, modifying, displaying, distributing or use of any software
and/or data from SBIA (collectively, the "Software") constitutes acceptance of
all of the terms and conditions of this Agreement. If you do not agree to such
terms and conditions, you have no right to contribute your Contribution, or to
download, copy, modify, display, distribute or use the Software.


PART A. CONTRIBUTION AGREEMENT - LICENSE TO SBIA WITH RIGHT TO SUBLICENSE ("CONTRIBUTION AGREEMENT").
-----------------------------------------------------------------------------------------------------

1. As used in this Contribution Agreement, "you" means the individual contributing
the Contribution to the Software maintained by SBIA and the institution or
entity which employs or is otherwise affiliated with such individual in
connection with such Contribution.

2. This Contribution Agreement applies to all Contributions made to the Software
maintained by SBIA, including without limitation Contributions made prior to
the date of first publication of this Agreement. If at any time you make a
Contribution to the Software, you represent that (i) you are legally authorized
and entitled to make such Contribution and to grant all licenses granted in this
Contribution Agreement with respect to such Contribution; (ii) if your
Contribution includes any patient data, all such data is de-identified in
accordance with U.S. confidentiality and security laws and requirements,
including but not limited to the Health Insurance Portability and Accountability
Act (HIPAA) and its regulations, and your disclosure of such data for the purposes
contemplated by this Agreement is properly authorized and in compliance with all
applicable laws and regulations; and (iii) you have preserved in the Contribution
all applicable attributions, copyright notices and licenses for any third party
software or data included in the Contribution.

3. Except for the licenses granted in this Agreement, you reserve all right,
title and interest in your Contribution.

4. You hereby grant to SBIA, with the right to sublicense, a perpetual, worldwide,
non-exclusive, no charge, royalty-free, irrevocable license to use, reproduce,
make derivative works of, display and distribute the Contribution. If your
Contribution is protected by patent, you hereby grant to SBIA, with the right
to sublicense, a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable license under your interest in patent rights covering the Contribution,
to make, have made, use, sell and otherwise transfer your Contribution, alone
or in combination with any other code.

5. You acknowledge and agree that SBIA may incorporate your Contribution into
the Software and may make the Software available to members of the public
on an open source basis under terms substantially in accordance with the
Software License set forth in Part B of this Agreement. You further acknowledge
and agree that SBIA shall have no liability arising in connection with claims
resulting from your breach of any of the terms of this Agreement.

6. YOU WARRANT THAT TO THE BEST OF YOUR KNOWLEDGE YOUR CONTRIBUTION DOES NOT
CONTAIN ANY CODE THAT REQUIRES OR PRESCRIBES AN "OPEN SOURCE LICENSE" FOR
DERIVATIVE WORKS (by way of non-limiting example, the GNU General Public
License or other so-called "reciprocal" license that requires any derived
work to be licensed under the GNU General Public License or other
"open source license").


PART B. DOWNLOADING AGREEMENT - LICENSE FROM SBIA WITH RIGHT TO SUBLICENSE ("SOFTWARE LICENSE").
------------------------------------------------------------------------------------------------

1. As used in this Software License, "you" means the individual downloading and/or
using, reproducing, modifying, displaying and/or distributing the Software and
the institution or entity which employs or is otherwise affiliated with such
individual in connection therewith. The Section of Biomedical Image Analysis,
Department of Radiology at the Universiy of Pennsylvania ("SBIA") hereby grants
you, with right to sublicense, with respect to SBIA's rights in the software,
and data, if any, which is the subject of this Software License (collectively,
the "Software"), a royalty-free, non-exclusive license to use, reproduce, make
derivative works of, display and distribute the Software, provided that:
(a) you accept and adhere to all of the terms and conditions of this Software
License; (b) in connection with any copy of or sublicense of all or any portion
of the Software, all of the terms and conditions in this Software License shall
appear in and shall apply to such copy and such sublicense, including without
limitation all source and executable forms and on any user documentation,
prefaced with the following words: "All or portions of this licensed product
(such portions are the "Software") have been obtained under license from the
Section of Biomedical Image Analysis, Department of Radiology at the University
of Pennsylvania and are subject to the following terms and conditions:"
(c) you preserve and maintain all applicable attributions, copyright notices
and licenses included in or applicable to the Software; (d) modified versions
of the Software must be clearly identified and marked as such, and must not
be misrepresented as being the original Software; and (e) you consider making,
but are under no obligation to make, the source code of any of your modifications
to the Software freely available to others on an open source basis.

2. The license granted in this Software License includes without limitation the
right to (i) incorporate the Software into proprietary programs (subject to
any restrictions applicable to such programs), (ii) add your own copyright
statement to your modifications of the Software, and (iii) provide additional
or different license terms and conditions in your sublicenses of modifications
of the Software; provided that in each case your use, reproduction or
distribution of such modifications otherwise complies with the conditions
stated in this Software License.

3. This Software License does not grant any rights with respect to third party
software, except those rights that SBIA has been authorized by a third
party to grant to you, and accordingly you are solely responsible for
(i) obtaining any permissions from third parties that you need to use,
reproduce, make derivative works of, display and distribute the Software,
and (ii) informing your sublicensees, including without limitation your
end-users, of their obligations to secure any such required permissions.

4. The Software has been designed for research purposes only and has not been
reviewed or approved by the Food and Drug Administration or by any other
agency. YOU ACKNOWLEDGE AND AGREE THAT CLINICAL APPLICATIONS ARE NEITHER
RECOMMENDED NOR ADVISED. Any commercialization of the Software is at the
sole risk of the party or parties engaged in such commercialization.
You further agree to use, reproduce, make derivative works of, display
and distribute the Software in compliance with all applicable governmental
laws, regulations and orders, including without limitation those relating
to export and import control.

5. The Software is provided "AS IS" and neither SBIA nor any contributor to
the software (each a "Contributor") shall have any obligation to provide
maintenance, support, updates, enhancements or modifications thereto.
SBIA AND ALL CONTRIBUTORS SPECIFICALLY DISCLAIM ALL EXPRESS AND IMPLIED
WARRANTIES OF ANY KIND INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
IN NO EVENT SHALL SBIA OR ANY CONTRIBUTOR BE LIABLE TO ANY PARTY FOR
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY ARISING IN ANY WAY RELATED
TO THE SOFTWARE, EVEN IF SBIA OR ANY CONTRIBUTOR HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES. TO THE MAXIMUM EXTENT NOT PROHIBITED BY LAW OR
REGULATION, YOU FURTHER ASSUME ALL LIABILITY FOR YOUR USE, REPRODUCTION,
MAKING OF DERIVATIVE WORKS, DISPLAY, LICENSE OR DISTRIBUTION OF THE SOFTWARE
AND AGREE TO INDEMNIFY AND HOLD HARMLESS SBIA AND ALL CONTRIBUTORS FROM
AND AGAINST ANY AND ALL CLAIMS, SUITS, ACTIONS, DEMANDS AND JUDGMENTS ARISING
THEREFROM.

6. None of the names, logos or trademarks of SBIA or any of SBIA's affiliates
or any of the Contributors, or any funding agency, may be used to endorse
or promote products produced in whole or in part by operation of the Software
or derived from or based on the Software without specific prior written
permission from the applicable party.

7. Any use, reproduction or distribution of the Software which is not in accordance
with this Software License shall automatically revoke all rights granted to you
under this Software License and render Paragraphs 1 and 2 of this Software
License null and void.

8. This Software License does not grant any rights in or to any intellectual
property owned by SBIA or any Contributor except those rights expressly
granted hereunder.


PART C. MISCELLANEOUS
---------------------

This Agreement shall be governed by and construed in accordance with the laws
of The Commonwealth of Pennsylvania without regard to principles of conflicts
of law. This Agreement shall supercede and replace any license terms that you
may have agreed to previously with respect to Software from SBIA.



CMake Modules
Expand Down
20 changes: 10 additions & 10 deletions INSTALL.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ configure the build and installation of this software are documented.
CMake Options
-------------

Option | Description
---------------- | -------------------------------------------------------------------
ITK_DIR | Specify directory of ITKConfig.cmake file. The ITK library is used by the basistest-driver executable if available. See Build Dependencies for more details.
MATLAB_DIR | Specify installation root directory of MATLAB. This variable is only available if BUILD_TESTING was set to ON and setting it can be omitted. If a MATLAB installation was specified, however, the tests for the build of binaries using the MATLAB Compiler or the MEX script respectively can be run.
Option | Description
------------------ | -------------------------------------------------------------------
DEPENDS_ITK_DIR | Specify directory of ITKConfig.cmake file. The ITK library is used by the basistest-driver executable if available. See Build Dependencies for more details.
DEPENDS_MATLAB_DIR | Specify installation root directory of MATLAB. This variable is only available if BUILD_TESTING was set to ON and setting it can be omitted. If a MATLAB installation was specified, however, the tests for the build of binaries using the MATLAB Compiler or the MEX script respectively can be run.


Advanced CMake Options
Expand All @@ -99,12 +99,12 @@ Advanced CMake Options
Depending on which language interpreters are installed on your system,
the following CMake options are available:

Option | Description
---------------- | -------------------------------------------------------------
USE_ITK | Whether to utilize the found ITK.
USE_PythonInterp | Whether to build/enable the Python utilities.
USE_Perl | Whether to build/enable the Perl utilities.
USE_BASH | Whether to build/enable the BASH utilities.
Option | Description
----------- | -------------------------------------------------------------
WITH_ITK | Whether to link standalone test driver with ITK.
WITH_Python | Whether to build/enable the Python utilities.
WITH_Perl | Whether to build/enable the Perl utilities.
WITH_BASH | Whether to build/enable the BASH utilities.



Expand Down
14 changes: 8 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,14 @@ you can reach the CMake BASIS developers on GitHub using the [CMake BASIS Issue
License
=======

Copyright (c) 2011-2013 University of Pennsylvania <br />
Copyright (c) 2013-2015 Andreas Schuh <br />
Copyright (c) 2013-2014 Carnegie Mellon University

CMake BASIS is available under a BSD compatible license. The complete license text
can be found on the [download page][10] and in the [COPYING.txt](/COPYING.txt) file.
Copyright (c) 2011-2013 University of Pennsylvania <br />
Copyright (c) 2013-2014 Carnegie Mellon University <br />
Copyright (c) 2013-2016 Andreas Schuh

CMake BASIS is distributed under the terms of the
[BSD 2-clause License](http://opensource.org/licenses/BSD-2-Clause).
The complete license text can be found on the [download page][10] and in the
[COPYING.txt](/COPYING.txt) file.


Package Content
Expand Down
2 changes: 1 addition & 1 deletion doc/download.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Either clone the Git repository:

.. code-block:: bash
git clone https://github.com/cmake-basis/BASIS.git
git clone --depth=1 https://github.com/cmake-basis/BASIS.git
or download the `latest BASIS release package <https://github.com/cmake-basis/BASIS/releases>`__.

Expand Down
50 changes: 24 additions & 26 deletions doc/install.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ BASIS can be build and installed from its sources.
+----------------------------+-----------+---------------------------------------------------------------+
| Package | Version | Description |
+============================+===========+===============================================================+
| CMake_ | 2.8.4 | A cross-platform, open-source build tool used to generate |
| CMake_ | 2.8.12 | A cross-platform, open-source build tool used to generate |
| | | platform specific build configurations. It configures the |
| | | system for the various build tools which perform the actual |
| | | build of the software. |
Expand Down Expand Up @@ -174,31 +174,29 @@ installation of BASIS itself are documented. See :doc:`howto/cmake-options`
for detailed information on general CMake Options available for the build
and installation of any package developed with BASIS.

.. option:: -DITK_DIR:PATH
.. option:: -DDEPENDS_ITK_DIR:PATH

Specify directory of ITKConfig.cmake file. The ITK library is
used by the basistest-driver executable if available. See
Build Dependencies for more details.
Specify directory of ITKConfig.cmake file. The ITK library is
used by the basistest-driver executable if available. See
Build Dependencies for more details.

.. option:: -DMATLAB_DIR:PATH
.. option:: -DDEPENDS_MATLAB_DIR:PATH

Specify installation root directory of MATLAB_. This variable
is only available if BUILD_TESTING was set to ON and setting
it can be omitted. If a MATLAB installation was specified,
however, the tests for the build of binaries using the `MATLAB Compiler`_
or the MEX_ script respectively can be run.
Specify installation root directory of MATLAB_. This variable
is only available if BUILD_TESTING was set to ON and setting
it can be omitted. If a MATLAB installation was specified,
however, the tests for the build of binaries using the `MATLAB Compiler`_
or the MEX_ script respectively can be run.

.. option:: -DDEFAULT_TEMPLATE:PATH

Path to the directory and version of the default mad-libs style text substitution project
template that will be installed with BASIS. See the
:doc:`Template Customization How-To <howto/use-and-customize-templates>` for details.
Path to the directory and version of the default mad-libs style text substitution project
template that will be installed with BASIS. See the
:doc:`Template Customization How-To <howto/use-and-customize-templates>` for details.

.. option:: -DINSTALL_ALL_TEMPLATES:BOOL
.. option:: -DINSTALL_TEMPLATE_DIR:BOOL

When OFF only the DEFAULT_TEMPLATE will be installed.
When ON all additional project templates included with
BASIS will be installed in addition to the DEFAULT_TEMPLATE.
Custom installation directory for project templates.


Advanced CMake Options
Expand All @@ -207,21 +205,21 @@ Advanced CMake Options
Depending on which language interpreters are installed on your system,
the following CMake options are available:

.. option:: -DUSE_ITK:BOOLEAN
.. option:: -DWITH_ITK:BOOLEAN

Whether to utilize the found ITK.
Whether to link the standalone test driver with ITK.

.. option:: -DUSE_PythonInterp:BOOLEAN
.. option:: -DWITH_Python:BOOLEAN

Whether to build/enable the Python utilities.
Whether to build/enable the Python utilities.

.. option:: -DUSE_Perl:BOOLEAN
.. option:: -DWITH_Perl:BOOLEAN

Whether to build/enable the Perl utilities.
Whether to build/enable the Perl utilities.

.. option:: -DUSE_BASH:BOOLEAN
.. option:: -DWITH_BASH:BOOLEAN

Whether to build/enable the BASH utilities.
Whether to build/enable the BASH utilities.


.. _BasisEnvironmentSetUp:
Expand Down

0 comments on commit 3a8d4b6

Please sign in to comment.