diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml index 606dddd..8cb80aa 100644 --- a/.github/workflows/install.yml +++ b/.github/workflows/install.yml @@ -3,10 +3,10 @@ name: Install on: push: branches: - - master + - develop pull_request: branches: - - master + - develop env: CTEST_OUTPUT_ON_FAILURE: 1 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index a2a098f..cba48ae 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -3,10 +3,10 @@ name: MacOS on: push: branches: - - master + - develop pull_request: branches: - - master + - develop env: CTEST_OUTPUT_ON_FAILURE: 1 diff --git a/.github/workflows/standalone.yml b/.github/workflows/standalone.yml index 5c3853e..bfb9c18 100644 --- a/.github/workflows/standalone.yml +++ b/.github/workflows/standalone.yml @@ -3,10 +3,10 @@ name: Standalone on: push: branches: - - master + - develop pull_request: branches: - - master + - develop env: CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index ba20a70..d3ed946 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -3,10 +3,10 @@ name: Style on: push: branches: - - master + - develop pull_request: branches: - - master + - develop env: CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index a36711d..dfc2ec5 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -3,10 +3,10 @@ name: Ubuntu on: push: branches: - - master + - develop pull_request: branches: - - master + - develop env: CTEST_OUTPUT_ON_FAILURE: 1 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a52b0ae..23ebdfb 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -3,10 +3,10 @@ name: Windows on: push: branches: - - master + - develop pull_request: branches: - - master + - develop env: CTEST_OUTPUT_ON_FAILURE: 1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 70cc295..bb7f411 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.14...3.19) # Note: update this to your new project's name and version project( Greeter - VERSION 1.0 + VERSION 1.0.1 LANGUAGES CXX ) @@ -64,12 +64,12 @@ add_library(Greeter SHARED ${headers} ${sources}) # EITHER: 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 -target_compile_options(Greeter PUBLIC "$<$:/permissive>") +# being a cross-platform target, we enforce standards conformance on MSVC EITHER: +# target_compile_options(Greeter PUBLIC "$<$:/permissive>") OR: if(MSVC) - # target_compile_options(Greeter PUBLIC /permissive) + target_compile_options(Greeter PUBLIC /permissive) endif() # Link dependencies EITHER: diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4e42348..ab9e791 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -42,7 +42,7 @@ file(GLOB sources CONFIGURE_DEPENDS source/*.cpp) add_executable(GreeterTests ${sources}) 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 if(NOT TEST_INSTALLED_VERSION) diff --git a/test/source/greeter.cpp b/test/source/greeter.cpp index 10a1242..f39eb74 100644 --- a/test/source/greeter.cpp +++ b/test/source/greeter.cpp @@ -20,7 +20,7 @@ TEST_CASE("Greeter version") { 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 #else - static_assert(std::string_view(GREETER_VERSION) == std::string_view("1.0")); - CHECK(std::string(GREETER_VERSION) == std::string("1.0")); + static_assert(std::string_view(GREETER_VERSION) == std::string_view("1.0.1")); + CHECK(std::string(GREETER_VERSION) == std::string("1.0.1")); #endif }