consolidate third party

.github/workflows/install.yml

@@ -6,6 +6,7 @@ on:
     branches:
       - main
       - develop
+      - dev/**
   pull_request:
     branches:
       - main

.github/workflows/linux.yml

@@ -6,7 +6,7 @@
       branches:
         - main
         - develop
-        - compatiblity_test*
+        - dev/**
     pull_request:
       branches:
         - main

.github/workflows/macos.yml

@@ -6,6 +6,7 @@ on:
     branches:
       - main
       - develop
+      - dev/**
   pull_request:
     branches:
       - main

.github/workflows/windows.yml

@@ -6,7 +6,7 @@ on:
     branches:
       - main
       - develop
-      - msvc_test
+      - dev/**
   pull_request:
     branches:
       - main

CMakeLists.txt

@@ -14,15 +14,14 @@ option(HPP_PROTO_ENABLE_SANITIZER "Enable address and undefined behavor sanitize
 
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-include(cmake/CPM.cmake)
 
 if(APPLE)
   set(CMAKE_CXX_VISIBILITY_PRESET "hidden")
   set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
 endif()
 
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 if (HPP_PROTO_ENABLE_SANITIZER)
   if (MSVC)
@@ -34,26 +33,7 @@ if (HPP_PROTO_ENABLE_SANITIZER)
   endif()
 endif()
 
-CPMAddPackage(
-  NAME glaze
-  GIT_TAG v2.9.5.mod
-  GITHUB_REPOSITORY huangminghuang/glaze
-)
-
-CPMAddPackage(
-  NAME is_utf8
-  VERSION 1.3.2
-  GITHUB_REPOSITORY simdutf/is_utf8
-  DOWNLOAD_ONLY ON
-)
-
-add_subdirectory(${is_utf8_SOURCE_DIR}/src ${is_utf8_BINARY_DIR})
-
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  file(REAL_PATH ${CMAKE_CXX_COMPILER} CLANG_REAL_PATH)
-  cmake_path(GET CLANG_REAL_PATH PARENT_PATH CLANG_DIR)
-endif()
-
+include(third-party.cmake)
 
 add_library(libhpp_proto INTERFACE)
 target_include_directories(libhpp_proto INTERFACE
@@ -83,16 +63,6 @@ else()
 endif()
 
 if(HPP_PROTO_TESTS)
-  CPMAddPackage(
-    NAME ut
-    GITHUB_REPOSITORY boost-ext/ut
-    VERSION 2.0.1
-    DOWNLOAD_ONLY ON
-  )
-  add_library(Boost::ut INTERFACE IMPORTED)
-  target_include_directories(Boost::ut INTERFACE ${ut_SOURCE_DIR}/include)
-  target_compile_definitions(Boost::ut INTERFACE BOOST_UT_DISABLE_MODULE)
-
   enable_testing()
   add_subdirectory(unittests)
   include(CTest)

benchmarks/CMakeLists.txt

@@ -1,17 +1,7 @@
-CPMAddPackage(
-      NAME benchmark
-      GITHUB_REPOSITORY google/benchmark
-      VERSION 1.8.3
-      OPTIONS
-      "BENCHMARK_ENABLE_TESTING OFF"
-      "BENCHMARK_ENABLE_INSTALL OFF"
-    )
+
 
 set(proto_files benchmark_messages_proto3.proto benchmark_messages_proto2.proto packed_repeated_message.proto)
 
-# disable clang-tidy check for generated file
-configure_file(../clang-tidy-disable-all-checks .clang-tidy)
-
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/owning)
 add_library(hpp_owning_benchmark_messages_lib INTERFACE ${proto_files})
 protobuf_generate(TARGET hpp_owning_benchmark_messages_lib

third-party.cmake

@@ -0,0 +1,39 @@
+include(cmake/CPM.cmake)
+
+CPMAddPackage(
+    NAME glaze
+    GIT_TAG v2.9.5.mod
+    GITHUB_REPOSITORY huangminghuang/glaze
+)
+
+CPMAddPackage(
+    NAME is_utf8
+    VERSION 1.3.2
+    GITHUB_REPOSITORY simdutf/is_utf8
+    DOWNLOAD_ONLY ON
+)
+
+add_subdirectory(${is_utf8_SOURCE_DIR}/src ${is_utf8_BINARY_DIR})
+
+if(HPP_PROTO_TESTS)
+    CPMAddPackage(
+        NAME ut
+        GITHUB_REPOSITORY boost-ext/ut
+        VERSION 2.0.1
+        DOWNLOAD_ONLY ON
+    )
+    add_library(Boost::ut INTERFACE IMPORTED)
+    target_include_directories(Boost::ut INTERFACE ${ut_SOURCE_DIR}/include)
+    target_compile_definitions(Boost::ut INTERFACE BOOST_UT_DISABLE_MODULE)
+endif()
+
+if(HPP_PROTO_BENCHMARKS)
+    CPMAddPackage(
+        NAME benchmark
+        GITHUB_REPOSITORY google/benchmark
+        VERSION 1.8.3
+        OPTIONS
+        "BENCHMARK_ENABLE_TESTING OFF"
+        "BENCHMARK_ENABLE_INSTALL OFF"
+    )
+endif()

tutorial/CMakeLists.txt

@@ -6,9 +6,6 @@ project(hpp_proto_tutorial
 
 if(PROJECT_IS_TOP_LEVEL)
   find_package(hpp_proto CONFIG REQUIRED)
-else()
-  # disable clang-tidy check for generated file
-  configure_file(../clang-tidy-disable-all-checks .clang-tidy)
 endif()