From 665436ddd0e1aca88b502fa6a266767e53e99d8a Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Wed, 27 Mar 2024 22:34:47 +0200 Subject: [PATCH 1/2] Include license in conan_provider.cmake --- conan_provider.cmake | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/conan_provider.cmake b/conan_provider.cmake index cba4606c..b3810720 100644 --- a/conan_provider.cmake +++ b/conan_provider.cmake @@ -1,3 +1,25 @@ +# The MIT License (MIT) +# +# Copyright (c) 2019 JFrog +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# 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. + set(CONAN_MINIMUM_VERSION 2.0.5) @@ -625,4 +647,3 @@ if(NOT _cmake_program) get_filename_component(PATH_TO_CMAKE_BIN "${CMAKE_COMMAND}" DIRECTORY) set(PATH_TO_CMAKE_BIN "${PATH_TO_CMAKE_BIN}" CACHE INTERNAL "Path where the CMake executable is") endif() - From 65e20434514d87d18dbec6bbb6489f4b4d190e5b Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Wed, 27 Mar 2024 23:38:26 +0200 Subject: [PATCH 2/2] Update copyright year Co-authored-by: James --- conan_provider.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conan_provider.cmake b/conan_provider.cmake index b3810720..6bf31b18 100644 --- a/conan_provider.cmake +++ b/conan_provider.cmake @@ -1,6 +1,6 @@ # The MIT License (MIT) # -# Copyright (c) 2019 JFrog +# Copyright (c) 2024 JFrog # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal