gsl-lite: Modernize recipe, add versions 0.43.0 and 1.0.1

recipes/gsl-lite/all/conandata.yml

@@ -1,4 +1,10 @@
 sources:
+  "1.0.1":
+    url: "https://github.com/gsl-lite/gsl-lite/archive/v1.0.1.tar.gz"
+    sha256: "063a0b4248a2afd8154b2b5fe9d64472868a166d3963682e823f81516194af79"
+  "0.43.0":
+    url: "https://github.com/gsl-lite/gsl-lite/archive/v0.43.0.tar.gz"
+    sha256: "e48c3138648156d2b85905b1d280d661fad61524c5c0ca10d3857036ca3dd519"
   "0.42.0":
     url: "https://github.com/gsl-lite/gsl-lite/archive/v0.42.0.tar.gz"
     sha256: "54a1b6f9db72eab5d8dcaf06b36d32d4f5da3471d91dac71aba19fe15291a773"

recipes/gsl-lite/all/conanfile.py

@@ -1,21 +1,23 @@
-from conan import ConanFile
-from conan.tools.files import get, copy
-from conan.tools.layout import basic_layout
 import os
 
-required_conan_version = ">=1.50.0"
+from conan import ConanFile
+from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
+from conan.tools.files import copy, get, rmdir
+from conan.tools.scm import Version
+
+required_conan_version = ">=2.1"
 
 
 class GslLiteConan(ConanFile):
     name = "gsl-lite"
-    description = "A single-file header-only version of ISO C++ " \
-                  "Guideline Support Library (GSL) for C++98, C++11 and later"
+    description = "ISO C++ Core Guidelines Library implementation for C++98, C++11 up"
     license = "MIT"
     url = "https://github.com/conan-io/conan-center-index"
-    homepage = "https://github.com/martinmoene/gsl-lite"
+    homepage = "https://github.com/gsl-lite/gsl-lite"
     topics = ("GSL", "header-only")
     package_type = "header-library"
     settings = "os", "arch", "compiler", "build_type"
+
     #  There are three configuration options for this GSL implementation's behavior
     #  when pre/post conditions on the GSL types are violated:
     #
@@ -30,8 +32,6 @@ class GslLiteConan(ConanFile):
         "on_contract_violation": "terminate",
     }
 
-    no_copy_source = True
-
     @property
     def _contract_map(self):
         return {
@@ -40,34 +40,42 @@ def _contract_map(self):
             "unenforced": "GSL_UNENFORCED_ON_CONTRACT_VIOLATION"
         }
 
+    def config_options(self):
+        if Version(self.version) >= "1.0":
+            del self.options.on_contract_violation
+
     def layout(self):
-        basic_layout(self, src_folder="src")
+        cmake_layout(self, src_folder="src")
 
     def package_id(self):
         self.info.clear()
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
+    def generate(self):
+        tc = CMakeToolchain(self)
+        tc.generate()
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+
     def package(self):
-        copy(self, "*", src=os.path.join(self.source_folder, "include"), dst=os.path.join(self.package_folder, "include"))
         copy(self, "LICENSE",  src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
+        cmake = CMake(self)
+        cmake.install()
+        rmdir(self, os.path.join(self.package_folder, "share"))
+        rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
 
     def package_info(self):
         self.cpp_info.set_property("cmake_file_name", "gsl-lite")
-        self.cpp_info.set_property("cmake_target_name", "gsl::gsl-lite")
-        self.cpp_info.bindirs = []
-        self.cpp_info.libdirs = []
-        # TODO: back to global scope in conan v2 once cmake_find_package* generators removed
-        self.cpp_info.components["gsllite"].defines = [self._contract_map[str(self.options.on_contract_violation)]]
-
-        # TODO: to remove in conan v2 once cmake_find_package* generators removed
-        self.cpp_info.filenames["cmake_find_package"] = "gsl-lite"
-        self.cpp_info.filenames["cmake_find_package_multi"] = "gsl-lite"
-        self.cpp_info.names["cmake_find_package"] = "gsl"
-        self.cpp_info.names["cmake_find_package_multi"] = "gsl"
-        self.cpp_info.components["gsllite"].names["cmake_find_package"] = "gsl-lite"
-        self.cpp_info.components["gsllite"].names["cmake_find_package_multi"] = "gsl-lite"
-        self.cpp_info.components["gsllite"].set_property("cmake_target_name", "gsl::gsl-lite")
-        self.cpp_info.components["gsllite"].bindirs = []
-        self.cpp_info.components["gsllite"].libdirs = []
+        self.cpp_info.set_property("cmake_target_name", "gsl-lite::gsl-lite")
+        self.cpp_info.set_property("cmake_target_aliases", ["gsl::gsl-lite"])
+
+        self.cpp_info.set_property("cmake_config_version_compat", "SameMajorVersion")
+
+        if Version(self.version) < "1.0":
+            # Don't define a cmake target for versions >= 1.0
+            # the old versions might expect it so keep it
+            self.cpp_info.components["gsllite"].defines = [self._contract_map[str(self.options.on_contract_violation)]]

recipes/gsl-lite/all/test_package/CMakeLists.txt

@@ -3,6 +3,13 @@ project(test_package LANGUAGES CXX)
 
 find_package(gsl-lite REQUIRED)
 
-add_executable(${PROJECT_NAME} test_package.cpp)
-target_link_libraries(${PROJECT_NAME} PRIVATE gsl::gsl-lite)
+add_executable(${PROJECT_NAME})
+if(gsl-lite_VERSION VERSION_GREATER_EQUAL "1.0.0")
+    target_sources(${PROJECT_NAME} PRIVATE test_package.cpp)
+    target_link_libraries(${PROJECT_NAME} PRIVATE gsl-lite::gsl-lite)
+else()
+    target_sources(${PROJECT_NAME} PRIVATE test_package_v0.cpp)
+    target_link_libraries(${PROJECT_NAME} PRIVATE gsl::gsl-lite)
+endif()
+
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11)

recipes/gsl-lite/all/test_package/test_package.cpp

@@ -1,9 +1,22 @@
+
 #include <iostream>
-#include <gsl/gsl-lite.hpp>
 
-int main()
+#include <gsl-lite/gsl-lite.hpp>
+
+void printCmdArgs( gsl_lite::span<gsl_lite::zstring const> cmdArgs )
+{
+    gsl_Expects( !cmdArgs.empty() );
+
+    auto argsWithoutExeName = cmdArgs.subspan( 1 );
+    for ( auto arg : argsWithoutExeName )
+    {
+        std::cout << arg << "\n";
+    }
+}
+
+int main( int argc, char* argv[] )
 {
-  char const s[] = "Hello, World!";
-  gsl::span<char const> sp(s) ;
-  std::cout << sp << std::endl;
+    auto numArgs = gsl_lite::narrow_failfast<std::size_t>( argc );
+    auto cmdArgs = gsl_lite::make_span( argv, numArgs );
+    printCmdArgs( cmdArgs );
 }

recipes/gsl-lite/all/test_package/test_package_v0.cpp

@@ -0,0 +1,22 @@
+
+#include <iostream>
+
+#include <gsl/gsl-lite.hpp>
+
+void printCmdArgs( gsl::span<gsl::zstring const> cmdArgs )
+{
+    Expects( !cmdArgs.empty() );
+
+    auto argsWithoutExeName = cmdArgs.subspan( 1 );
+    for ( auto arg : argsWithoutExeName )
+    {
+        std::cout << arg << "\n";
+    }
+}
+
+int main( int argc, char* argv[] )
+{
+    auto numArgs = gsl::narrow<std::size_t>( argc );
+    auto cmdArgs = gsl::make_span( argv, numArgs );
+    printCmdArgs( cmdArgs );
+}