Merge branch 'feature/#226_switch_to_bsd_3clause' into 'develop'

Feature/#226 switch to bsd 3clause See merge request VR-Group/Project_Phoenix!63

Merge branch 'feature/#226_switch_to_bsd_3clause' into 'develop'
84d7adb4 · Jonathan Wendt · ac304c8a · e0ef626f · 84d7adb4 · 84d7adb4
Commit 84d7adb4 authored Nov 30, 2017 by Jonathan Wendt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # Project Phoenix
 #
 # Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
 #                                 License
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
 # you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://opensource.org/licenses/BSD-3-Clause
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------

 cmake_minimum_required(VERSION 3.8.2)


--- a/LICENSE
+++ b/LICENSE
@@ -2,7 +2,7 @@
 Project Phoenix

 Copyright (c) 2017 RWTH Aachen University, Germany,
- Virtual Reality & Immersive Visualisation Group.
+ Virtual Reality & Immersive Visualization Group.
 --------------------------------------------------------------------------------
 Contact Information

@@ -10,7 +10,7 @@
   info@vr.rwth-aachen.de

 Address:
-   Virtual Reality & Immersive Visualisation Group
+   Virtual Reality & Immersive Visualization Group
   RWTH Aachen University
   Seffenter Weg 23
   52074 Aachen

--- a/README.md
+++ b/README.md
@@ -10,11 +10,12 @@ Virtual Reality & Immersive Visualization Group.

 ## License

-Licensed under the Apache License, Version 2.0 (the "License");
+Licensed under the 3-Clause BSD License (the "License");
 you may not use this file except in compliance with the License.
+See the file LICENSE for the full text.
 You may obtain a copy of the License at

-    http://www.apache.org/licenses/LICENSE-2.0
+    https://opensource.org/licenses/BSD-3-Clause

 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

--- a/cmake/ConanHelpers.cmake
+++ b/cmake/ConanHelpers.cmake
-#-------------------------------------------------------------------------------
-# ConanHelpers.cmake
+#------------------------------------------------------------------------------
+# Project Phoenix
 #
 # Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
 #                                 License
-#                            only for this file
 #
 # Licensed under the 3-Clause BSD License (the "License");
 # you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
 # You may obtain a copy of the License at
 #
 #     https://opensource.org/licenses/BSD-3-Clause
@@ -18,7 +18,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------

 #download/build the missing dependencies
 include(conan)

--- a/cmake/ConfigureFiles.cmake
+++ b/cmake/ConfigureFiles.cmake
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # Project Phoenix
 #
 # Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
 #                                 License
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
 # you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://opensource.org/licenses/BSD-3-Clause
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------

 function(GENERATE_CONFIGURE_FILES TARGET)
  # config for the build tree

--- a/cmake/FindSDL2.cmake
+++ b/cmake/FindSDL2.cmake
--- a/cmake/Testing.cmake
+++ b/cmake/Testing.cmake
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # Project Phoenix
 #
 # Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
 #                                 License
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
 # you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://opensource.org/licenses/BSD-3-Clause
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------

 include(CTest)
 enable_testing()

--- a/cmake/WarningLevels.cmake
+++ b/cmake/WarningLevels.cmake
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # Project Phoenix
 #
 # Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
 #                                 License
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
 # you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://opensource.org/licenses/BSD-3-Clause
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------

 # flags for default warning levels
 set(WARNING_LEVELS_RWTH_CLANG

--- a/cmake/conan.cmake
+++ b/cmake/conan.cmake
--- a/cmake/cppcheck.cmake
+++ b/cmake/cppcheck.cmake
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # Project Phoenix
 #
 # Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
 #                                 License
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
 # you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://opensource.org/licenses/BSD-3-Clause
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------

 set(CPPCHECK_COMMAND NOTFOUND)
 find_program(CPPCHECK_COMMAND NAMES cppcheck cppcheck.exe 

--- a/cmake/cpplint.cmake
+++ b/cmake/cpplint.cmake
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # Project Phoenix
 #
 # Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
 #                                 License
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
 # you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://opensource.org/licenses/BSD-3-Clause
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------

 find_package(PythonInterp 2.7 REQUIRED)
 if(NOT PYTHON_EXECUTABLE)

--- a/cmake/phoenix-config.cmake.in
+++ b/cmake/phoenix-config.cmake.in
@@ -2,7 +2,7 @@
 # Project Phoenix
 #
 # Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
+# Virtual Reality & Immersive Visualization Group.
 #-------------------------------------------------------------------------------
 #                                  License
 #

--- a/cmake/resources_path.hpp.in
+++ b/cmake/resources_path.hpp.in
@@ -2,7 +2,7 @@
 // Project Phoenix
 //
 // Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
 //------------------------------------------------------------------------------
 //                                 License
 //

--- a/cmake/suppress_warnings.hpp.in
+++ b/cmake/suppress_warnings.hpp.in
@@ -2,7 +2,7 @@
 // Project Phoenix
 //
 // Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
 //------------------------------------------------------------------------------
 //                                 License
 //

--- a/conanfile.py
+++ b/conanfile.py
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # Project Phoenix
 #
 # Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
 #                                 License
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
 # you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://opensource.org/licenses/BSD-3-Clause
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------

 from conans import ConanFile, CMake


--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # Project Phoenix
 #
 # Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
 #                                 License
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
 # you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://opensource.org/licenses/BSD-3-Clause
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------

 add_subdirectory(viewer)
--- a/demos/viewer/CMakeLists.txt
+++ b/demos/viewer/CMakeLists.txt
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # Project Phoenix
 #
 # Copyright (c) 2017 RWTH Aachen University, Germany,
-# Virtual Reality & Immersive Visualisation Group.
-#-------------------------------------------------------------------------------
+# Virtual Reality & Immersive Visualization Group.
+#------------------------------------------------------------------------------
 #                                 License
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the 3-Clause BSD License (the "License");
 # you may not use this file except in compliance with the License.
+# See the file LICENSE for the full text.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://opensource.org/licenses/BSD-3-Clause
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------

 file(GLOB VIEWER_SOURCES src/*.cpp)
 file(GLOB VIEWER_HEADERS src/*.hpp)

--- a/demos/viewer/src/rotation_behavior.cpp
+++ b/demos/viewer/src/rotation_behavior.cpp
@@ -2,15 +2,16 @@
 // Project Phoenix
 //
 // Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
 //------------------------------------------------------------------------------
 //                                 License
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
 // you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//     https://opensource.org/licenses/BSD-3-Clause
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

--- a/demos/viewer/src/rotation_behavior.hpp
+++ b/demos/viewer/src/rotation_behavior.hpp
@@ -2,15 +2,16 @@
 // Project Phoenix
 //
 // Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
 //------------------------------------------------------------------------------
 //                                 License
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
 // you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//     https://opensource.org/licenses/BSD-3-Clause
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

--- a/demos/viewer/src/viewer.cpp
+++ b/demos/viewer/src/viewer.cpp
@@ -2,15 +2,16 @@
 // Project Phoenix
 //
 // Copyright (c) 2017 RWTH Aachen University, Germany,
-// Virtual Reality & Immersive Visualisation Group.
+// Virtual Reality & Immersive Visualization Group.
 //------------------------------------------------------------------------------
 //                                 License
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Licensed under the 3-Clause BSD License (the "License");
 // you may not use this file except in compliance with the License.
+// See the file LICENSE for the full text.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//     https://opensource.org/licenses/BSD-3-Clause
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,