Skip to content

Set default to C++20,, bumped OpenSSL to 3.4.1, updated development container #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2025
Merged

Set default to C++20,, bumped OpenSSL to 3.4.1, updated development container #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .dev/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -11,7 +11,7 @@ ARG GROUP_ID=1000
WORKDIR /project

# Define Labels
LABEL maintainer="Michele Adduci <adduci@tutanota.com>" \
LABEL maintainer="Michele Adduci <michele@adduci.org>" \
description="Docker image for C++ development with Conan and CMake" \
cmake.version="${CMAKE_VERSION}" \
conan.version="${CONAN_VERSION}"
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# MIT License
# Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
# Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>
#
# Main CMake Project file

Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion cmake/clang_format.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# MIT License
# Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
# Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>
#
# Clang-Format instructions

Expand Down
2 changes: 1 addition & 1 deletion cmake/compiler_options.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# MIT License
# Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
# Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>
#
# Compiler options with hardening flags

Expand Down
4 changes: 2 additions & 2 deletions cmake/cpack.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# MIT License
# Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
# Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>
#
# Packaging instructios

set(CPACK_PACKAGE_VENDOR "Michele Adduci <adduci@tutanota.com>")
set(CPACK_PACKAGE_VENDOR "Michele Adduci <michele@adduci.org>")
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}")
Expand Down
2 changes: 1 addition & 1 deletion cmake/cppcheck.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# MIT License
# Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
# Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>
#
# cppcheck instructions

Expand Down
2 changes: 1 addition & 1 deletion cmake/dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# MIT License
# Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
# Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>
#
# Dependencies

Expand Down
2 changes: 1 addition & 1 deletion conanfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[requires]
openssl/3.3.2
openssl/3.4.1
doctest/2.4.11

[generators]
Expand Down
2 changes: 1 addition & 1 deletion project/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# MIT License
# Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
# Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>
#
# Project-related instructions

Expand Down
2 changes: 1 addition & 1 deletion project/helloapp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# MIT License
# Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
# Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>
#
# helloapp target instructions

Expand Down
2 changes: 1 addition & 1 deletion project/hellolib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# MIT License
# Copyright (c) 2018-Today Michele Adduci <adduci@tutanota.com>
# Copyright (c) 2018-Today Michele Adduci <michele@adduci.org>
#
# hellolib target instructions

Expand Down