schtobia/ModernCppStarter
1
0
Fork 0
mirror of https://github.com/TheLartians/ModernCppStarter.git synced 2025-09-01 06:30:52 +02:00
Code Issues Activity

change github actions to develop branch

Browse source 
set version to v1.0.1
This commit is contained in:
ClausKlein 2021-02-12 23:29:14 +01:00
parent 47fa7c6933
commit 1aad14a6fa
9 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/install.yml vendored
View file

@ -3,10 +3,10 @@ name: Install
on: on:
push: push:
branches: branches:
- master - develop
pull_request: pull_request:
branches: branches:
- master - develop
env: env:
CTEST_OUTPUT_ON_FAILURE: 1 CTEST_OUTPUT_ON_FAILURE: 1

4
.github/workflows/macos.yml vendored
View file

@ -3,10 +3,10 @@ name: MacOS
on: on:
push: push:
branches: branches:
- master - develop
pull_request: pull_request:
branches: branches:
- master - develop
env: env:
CTEST_OUTPUT_ON_FAILURE: 1 CTEST_OUTPUT_ON_FAILURE: 1

4
.github/workflows/standalone.yml vendored
View file

@ -3,10 +3,10 @@ name: Standalone
on: on:
push: push:
branches: branches:
- master - develop
pull_request: pull_request:
branches: branches:
- master - develop
env: env:
CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules

4
.github/workflows/style.yml vendored
View file

@ -3,10 +3,10 @@ name: Style
on: on:
push: push:
branches: branches:
- master - develop
pull_request: pull_request:
branches: branches:
- master - develop
env: env:
CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules

4
.github/workflows/ubuntu.yml vendored
View file

@ -3,10 +3,10 @@ name: Ubuntu
on: on:
push: push:
branches: branches:
- master - develop
pull_request: pull_request:
branches: branches:
- master - develop
env: env:
CTEST_OUTPUT_ON_FAILURE: 1 CTEST_OUTPUT_ON_FAILURE: 1

4
.github/workflows/windows.yml vendored
View file

@ -3,10 +3,10 @@ name: Windows
on: on:
push: push:
branches: branches:
- master - develop
pull_request: pull_request:
branches: branches:
- master - develop
env: env:
CTEST_OUTPUT_ON_FAILURE: 1 CTEST_OUTPUT_ON_FAILURE: 1

10
CMakeLists.txt
View file

@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.14...3.19)
# Note: update this to your new project's name and version # Note: update this to your new project's name and version
project( project(
Greeter Greeter
VERSION 1.0 VERSION 1.0.1
LANGUAGES CXX LANGUAGES CXX
) )
@ -64,12 +64,12 @@ add_library(Greeter SHARED ${headers} ${sources})
# EITHER: # EITHER:
set_target_properties(Greeter PROPERTIES CXX_STANDARD ${CMAKE_CXX_STANDARD}) set_target_properties(Greeter PROPERTIES CXX_STANDARD ${CMAKE_CXX_STANDARD})
# OR target_compile_features(Greeter PUBLIC cxx_std_17) # OR: target_compile_features(Greeter PUBLIC cxx_std_17)
# being a cross-platform target, we enforce standards conformance on MSVC # being a cross-platform target, we enforce standards conformance on MSVC EITHER:
target_compile_options(Greeter PUBLIC "$<$<COMPILE_LANG_AND_ID:CXX,MSVC>:/permissive>") # target_compile_options(Greeter PUBLIC "$<$<COMPILE_LANG_AND_ID:CXX,MSVC>:/permissive>") OR:
if(MSVC) if(MSVC)
# target_compile_options(Greeter PUBLIC /permissive) target_compile_options(Greeter PUBLIC /permissive)
endif() endif()
# Link dependencies EITHER: # Link dependencies EITHER:

2
test/CMakeLists.txt
View file

@ -42,7 +42,7 @@ file(GLOB sources CONFIGURE_DEPENDS source/*.cpp)
add_executable(GreeterTests ${sources}) add_executable(GreeterTests ${sources})
target_link_libraries(GreeterTests doctest::doctest Greeter::Greeter) target_link_libraries(GreeterTests doctest::doctest Greeter::Greeter)
set_target_properties(GreeterTests PROPERTIES CXX_STANDARD 17) set_target_properties(GreeterTests PROPERTIES CXX_STANDARD 20)
# enable compiler warnings # enable compiler warnings
if(NOT TEST_INSTALLED_VERSION) if(NOT TEST_INSTALLED_VERSION)

4
test/source/greeter.cpp
View file

@ -20,7 +20,7 @@ TEST_CASE("Greeter version") {
static_assert(std::string_view(GREETER_VERSION).starts_with("1.0")); // TBD C++20 only static_assert(std::string_view(GREETER_VERSION).starts_with("1.0")); // TBD C++20 only
CHECK(std::string(GREETER_VERSION).starts_with("1.0")); // SameMajorVersion CHECK(std::string(GREETER_VERSION).starts_with("1.0")); // SameMajorVersion
#else #else
static_assert(std::string_view(GREETER_VERSION) == std::string_view("1.0")); static_assert(std::string_view(GREETER_VERSION) == std::string_view("1.0.1"));
CHECK(std::string(GREETER_VERSION) == std::string("1.0")); CHECK(std::string(GREETER_VERSION) == std::string("1.0.1"));
#endif #endif
} }