Skip to content

Commit

Permalink
Merge pull request #318 from OpenWaterAnalytics/hotfix-license
Browse files Browse the repository at this point in the history
Updating LICENSE file
  • Loading branch information
michaeltryby authored Dec 21, 2020
2 parents ca28c83 + fbc497d commit b3bcc3b
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 5 deletions.
4 changes: 2 additions & 2 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ Adam Erispaha <[email protected]>
Sam Hatchett <[email protected]>
Gonzalo Peña-Castellanos <[email protected]>
Abhiram Mullapudi <[email protected]>
Jennifer Wu <jennifer.wu@xyleminc.com>
Jennifer Wu <wuu.jennifer@gmail.com >
Dominik Leutnant <[email protected]>
Xu Xi <[email protected]>
Caleb Buahin <caleb.buahin@xyleminc.com>
Caleb Buahin <caleb.buahin@gmail.com>
Hsi-Nien Tan <[email protected]>
Mingda Zhang <[email protected]>
Laurent Courty <[email protected]>
10 changes: 10 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,16 @@ set(CMAKE_INSTALL_OPENMP_LIBRARIES TRUE)
include(InstallRequiredSystemLibraries)


# Create install target for License and Authors files
install(
FILES
"LICENSE"
"AUTHORS"
DESTINATION
"."
)


# Configure CPack driven installer package
set(CPACK_GENERATOR "ZIP;TGZ")
set(CPACK_PACKAGE_VENDOR "US_EPA")
Expand Down
38 changes: 35 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,8 +1,34 @@
This project contains original material released as part of USEPA SWMM v5.1.13.
Original material residing in the public domain is unclaimable.

This project also contains new material prepared by the United States
Government for which domestic copyright protection is not available under 17
USC § 105.


Public Domain

Material original to USEPA SWMM v5.1.13 No Copyright Restrictions

Output library, shared objects, CLI, build and test systems No Copyright
Restrictions 2020 U.S. Federal Government

===============================================================================

This project contains material from https://github.com/OpenWaterAnalytics/
Stormwater-Management-Model. All material created by the AUTHORS is released
under the MIT License.

OWA SWMM may also includes third-party software libraries which have separate
licensing policies.



MIT License

Contains public domain works. Other works copyright the AUTHORS
Copyright (c) 2020 see AUTHORS, excluding material in the public
domain.

Copyright (c) 2016 (see AUTHORS.txt).

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -20,4 +46,10 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.



Third-Party Libraries

OpenMP

0 comments on commit b3bcc3b

Please sign in to comment.