Browse Source

Merge branch 'master' into master_262

Vojtech Bubnik 1 year ago
parent
commit
8dad25efc4

+ 5 - 0
build_win.bat

@@ -1,3 +1,8 @@
+REM /|/ Copyright (c) 2022 Jebtrix @Jebtrix
+REM /|/ Copyright (c) 2021 Justin Schuh @jschuh
+REM /|/
+REM /|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
+REM /|/
 @setlocal disableDelayedExpansion enableExtensions
 @IF "%PS_ECHO_ON%" NEQ "" (echo on) ELSE (echo off)
 @GOTO :MAIN

+ 4 - 0
deps/Blosc/Blosc.cmake

@@ -1,3 +1,7 @@
+#/|/ Copyright (c) Prusa Research 2021 Tomáš Mészáros @tamasmeszaros
+#/|/
+#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
+#/|/
 if(BUILD_SHARED_LIBS)
     set(_build_shared ON)
     set(_build_static OFF)

+ 4 - 0
deps/Boost/Boost.cmake

@@ -1,3 +1,7 @@
+#/|/ Copyright (c) Prusa Research 2021 - 2022 Tomáš Mészáros @tamasmeszaros, Filip Sykala @Jony01, Lukáš Hejl @hejllukas, Enrico Turri @enricoturri1966
+#/|/
+#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
+#/|/
 include(ExternalProject)
 
 if (WIN32)

+ 4 - 0
deps/CGAL/CGAL.cmake

@@ -1,3 +1,7 @@
+#/|/ Copyright (c) Prusa Research 2019 - 2022 Tomáš Mészáros @tamasmeszaros, Filip Sykala @Jony01, Vojtěch Bubník @bubnikv, David Kocík @kocikdav
+#/|/
+#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
+#/|/
 prusaslicer_add_cmake_project(
     CGAL
     # GIT_REPOSITORY https://github.com/CGAL/cgal.git

+ 4 - 0
deps/CGAL/cgal/CGALConfigVersion.cmake

@@ -1,3 +1,7 @@
+#/|/ Copyright (c) Prusa Research 2020 Tomáš Mészáros @tamasmeszaros
+#/|/
+#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
+#/|/
 # This is a basic version file for the Config-mode of find_package().
 # It is used by write_basic_package_version_file() as input file for configure_file()
 # to create a version-file which can be installed along a config.cmake file.

+ 4 - 0
deps/CMakeLists.txt

@@ -1,3 +1,7 @@
+#/|/ Copyright (c) Prusa Research 2018 - 2022 Lukáš Matěna @lukasmatena, Tomáš Mészáros @tamasmeszaros, Filip Sykala @Jony01, Vojtěch Bubník @bubnikv, Vojtěch Král @vojtechkral
+#/|/
+#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
+#/|/
 #
 # This CMake project downloads, configures and builds PrusaSlicer dependencies on Unix and Windows.
 #

+ 4 - 0
deps/CURL/CURL.cmake

@@ -1,3 +1,7 @@
+#/|/ Copyright (c) Prusa Research 2021 - 2022 Tomáš Mészáros @tamasmeszaros
+#/|/
+#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
+#/|/
 set(_curl_platform_flags 
   -DENABLE_IPV6:BOOL=ON
   -DENABLE_VERSIONED_SYMBOLS:BOOL=ON

+ 4 - 0
deps/Cereal/Cereal.cmake

@@ -1,3 +1,7 @@
+#/|/ Copyright (c) Prusa Research 2021 - 2022 Tomáš Mészáros @tamasmeszaros, Filip Sykala @Jony01
+#/|/
+#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
+#/|/
 prusaslicer_add_cmake_project(Cereal
     URL "https://github.com/USCiLab/cereal/archive/refs/tags/v1.3.0.zip"
     URL_HASH SHA256=71642cb54658e98c8f07a0f0d08bf9766f1c3771496936f6014169d3726d9657

+ 4 - 0
deps/EXPAT/EXPAT.cmake

@@ -1,3 +1,7 @@
+#/|/ Copyright (c) Prusa Research 2020 - 2022 Tomáš Mészáros @tamasmeszaros, Filip Sykala @Jony01
+#/|/
+#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
+#/|/
 #prusaslicer_add_cmake_project(EXPAT
 #  # GIT_REPOSITORY https://github.com/nigels-com/glew.git
 #  # GIT_TAG 3a8eff7 # 2.1.0

+ 4 - 0
deps/GLEW/GLEW.cmake

@@ -1,3 +1,7 @@
+#/|/ Copyright (c) Prusa Research 2019 - 2022 Tomáš Mészáros @tamasmeszaros, Filip Sykala @Jony01
+#/|/
+#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
+#/|/
 # We have to check for OpenGL to compile GLEW
 set(OpenGL_GL_PREFERENCE "LEGACY") # to prevent a nasty warning by cmake
 find_package(OpenGL QUIET REQUIRED)

Some files were not shown because too many files changed in this diff