Update CI scripts

chocolacula · Jul 19, 2023 · fc7d3b5 · fc7d3b5
1 parent 38856fa
commit fc7d3b5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 {
   "name": "reflection-cpp",
-  "version": "2.9.0",
+  "version": "3.0.0",
   "default-features": [
     "library"
   ],