From 78f1976729d8dc1d5c5e0aa33e1f85be27ebdc12 Mon Sep 17 00:00:00 2001 From: Michele Adduci Date: Thu, 8 May 2025 22:27:02 +0200 Subject: [PATCH] Updated contact, bumped OpenSSL to 3.4.1, updated development container --- .dev/Dockerfile | 6 +++--- CMakeLists.txt | 8 ++++---- LICENSE | 2 +- cmake/clang_format.cmake | 2 +- cmake/compiler_options.cmake | 2 +- cmake/cpack.cmake | 4 ++-- cmake/cppcheck.cmake | 2 +- cmake/dependencies.cmake | 2 +- conanfile.txt | 2 +- project/CMakeLists.txt | 2 +- project/helloapp/CMakeLists.txt | 2 +- project/hellolib/CMakeLists.txt | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.dev/Dockerfile b/.dev/Dockerfile index db36019..ac0aff0 100644 --- a/.dev/Dockerfile +++ b/.dev/Dockerfile @@ -1,8 +1,8 @@ FROM ubuntu:24.04 # Define Conan and CMake versions -ARG CONAN_VERSION=2.6.0 -ARG CMAKE_VERSION=3.30.1 +ARG CONAN_VERSION=2.16.1 +ARG CMAKE_VERSION=4.0.2 # Define User ID and Group ID ARG USER_ID=1000 @@ -11,7 +11,7 @@ ARG GROUP_ID=1000 WORKDIR /project # Define Labels -LABEL maintainer="Michele Adduci " \ +LABEL maintainer="Michele Adduci " \ description="Docker image for C++ development with Conan and CMake" \ cmake.version="${CMAKE_VERSION}" \ conan.version="${CONAN_VERSION}" diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b6d44f..63727b6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # MIT License -# Copyright (c) 2018-Today Michele Adduci +# Copyright (c) 2018-Today Michele Adduci # # Main CMake Project file @@ -17,12 +17,12 @@ project(moderncpp-project LANGUAGES CXX DESCRIPTION "moderncpp-project is a star # Set Project version (used for library versioning and for CPack) set(CMAKE_PROJECT_VERSION_MAJOR 1) -set(CMAKE_PROJECT_VERSION_MINOR 1) -set(CMAKE_PROJECT_VERSION_PATCH 2) +set(CMAKE_PROJECT_VERSION_MINOR 2) +set(CMAKE_PROJECT_VERSION_PATCH 0) set(CMAKE_PROJECT_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH}) # Set required C++ Standard -set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED TRUE) # Generate the compile_commands.json file set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE) diff --git a/LICENSE b/LICENSE index 492eea8..e894191 100755 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018-Today Michele Adduci +Copyright (c) 2018-Today Michele Adduci Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmake/clang_format.cmake b/cmake/clang_format.cmake index 03b2180..b302fe0 100644 --- a/cmake/clang_format.cmake +++ b/cmake/clang_format.cmake @@ -1,5 +1,5 @@ # MIT License -# Copyright (c) 2018-Today Michele Adduci +# Copyright (c) 2018-Today Michele Adduci # # Clang-Format instructions diff --git a/cmake/compiler_options.cmake b/cmake/compiler_options.cmake index efb0aaf..a1a368f 100644 --- a/cmake/compiler_options.cmake +++ b/cmake/compiler_options.cmake @@ -1,5 +1,5 @@ # MIT License -# Copyright (c) 2018-Today Michele Adduci +# Copyright (c) 2018-Today Michele Adduci # # Compiler options with hardening flags diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake index a90148b..4bac444 100644 --- a/cmake/cpack.cmake +++ b/cmake/cpack.cmake @@ -1,9 +1,9 @@ # MIT License -# Copyright (c) 2018-Today Michele Adduci +# Copyright (c) 2018-Today Michele Adduci # # Packaging instructios -set(CPACK_PACKAGE_VENDOR "Michele Adduci ") +set(CPACK_PACKAGE_VENDOR "Michele Adduci ") set(CPACK_PACKAGE_VERSION_MAJOR "${CMAKE_PROJECT_VERSION_MAJOR}") set(CPACK_PACKAGE_VERSION_MINOR "${CMAKE_PROJECT_VERSION_MINOR}") set(CPACK_PACKAGE_VERSION_PATCH "${CMAKE_PROJECT_VERSION_PATCH}") diff --git a/cmake/cppcheck.cmake b/cmake/cppcheck.cmake index 65d8f18..2644207 100644 --- a/cmake/cppcheck.cmake +++ b/cmake/cppcheck.cmake @@ -1,5 +1,5 @@ # MIT License -# Copyright (c) 2018-Today Michele Adduci +# Copyright (c) 2018-Today Michele Adduci # # cppcheck instructions diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 9176c87..44c9cca 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -1,5 +1,5 @@ # MIT License -# Copyright (c) 2018-Today Michele Adduci +# Copyright (c) 2018-Today Michele Adduci # # Dependencies diff --git a/conanfile.txt b/conanfile.txt index edcf235..f2cea5e 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,5 +1,5 @@ [requires] -openssl/3.3.2 +openssl/3.4.1 doctest/2.4.11 [generators] diff --git a/project/CMakeLists.txt b/project/CMakeLists.txt index 3631872..370ac54 100644 --- a/project/CMakeLists.txt +++ b/project/CMakeLists.txt @@ -1,5 +1,5 @@ # MIT License -# Copyright (c) 2018-Today Michele Adduci +# Copyright (c) 2018-Today Michele Adduci # # Project-related instructions diff --git a/project/helloapp/CMakeLists.txt b/project/helloapp/CMakeLists.txt index 3199846..adbef5e 100644 --- a/project/helloapp/CMakeLists.txt +++ b/project/helloapp/CMakeLists.txt @@ -1,5 +1,5 @@ # MIT License -# Copyright (c) 2018-Today Michele Adduci +# Copyright (c) 2018-Today Michele Adduci # # helloapp target instructions diff --git a/project/hellolib/CMakeLists.txt b/project/hellolib/CMakeLists.txt index 6c3e435..c349db6 100644 --- a/project/hellolib/CMakeLists.txt +++ b/project/hellolib/CMakeLists.txt @@ -1,5 +1,5 @@ # MIT License -# Copyright (c) 2018-Today Michele Adduci +# Copyright (c) 2018-Today Michele Adduci # # hellolib target instructions