From fc7d3b559afe5d2c9e6a2f421db82c1873579d25 Mon Sep 17 00:00:00 2001 From: Maxim Voloshin Date: Wed, 19 Jul 2023 19:14:54 +0300 Subject: [PATCH] Update CI scripts --- .github/workflows/cmake.yml | 2 +- cmake/tools.cmake | 3 ++- generator/config.h | 2 +- vcpkg.json | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index b872f25..b348e42 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -35,7 +35,7 @@ jobs: - name: Install generator run: | - wget -O gen.zip https://github.com/chocolacula/easy_reflection_cpp/releases/download/2.9.0/er_gen-ubuntu22-x64.zip + wget -O gen.zip https://github.com/chocolacula/easy_reflection_cpp/releases/download/3.0.0/er_gen-ubuntu22-x64.zip unzip gen.zip -d output chmod +x output/er_gen diff --git a/cmake/tools.cmake b/cmake/tools.cmake index 58e73b6..70426d8 100644 --- a/cmake/tools.cmake +++ b/cmake/tools.cmake @@ -90,7 +90,8 @@ endfunction() function(disable_attribute_warnings) if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") add_compile_options("-Wno-attributes") - elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + # matches Clang and AppleClang + elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") add_compile_options("-Wno-unknown-attributes") endif() endfunction() diff --git a/generator/config.h b/generator/config.h index 3707532..4f3f03b 100644 --- a/generator/config.h +++ b/generator/config.h @@ -9,7 +9,7 @@ struct [[er::reflect]] Config { struct Templates { std::string header; - [[er::reflect("enum")]] std::string for_enum; + [[er::alias("enum")]] std::string for_enum; std::string object; } templates; diff --git a/vcpkg.json b/vcpkg.json index be14a29..8c18256 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "name": "reflection-cpp", - "version": "2.9.0", + "version": "3.0.0", "default-features": [ "library" ],