Merge remote-tracking branch 'origin/pull-request/#777-Allow-Building…

…-Tests-as-Submodule-and-GCC-less-than-11' into development
ETLCPP · Oct 27, 2023 · 39c3ca8 · 39c3ca8
2 parents e8eeeba + 98ebaff
commit 39c3ca8
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 19 deletions.
diff --git a/.github/workflows/clang-syntax-checks.yml b/.github/workflows/clang-syntax-checks.yml
@@ -1,9 +1,9 @@
 name: clang syntax checks
 on:
  push:
- branches: [ master, development ]
+ branches: [ master, development, pull-request/* ]
  pull_request:
- branches: [ master ]
+ branches: [ master, pull-request/* ]
 
 jobs:
  build-clang-cpp03-linux-STL:

diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml
@@ -1,11 +1,12 @@
 name: clang
 on:
  push:
- branches: [ master, development ]
+ branches: [ master, development, pull-request/* ]
  pull_request:
- branches: [ master ]
+ branches: [ master, pull-request/* ]
 
 jobs:
+
  build-clang-cpp11-linux-stl:
  name: Clang C++11 Linux - STL
  runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/gcc-syntax-checks.yml b/.github/workflows/gcc-syntax-checks.yml
@@ -1,9 +1,9 @@
 name: gcc syntax checks
 on:
  push:
- branches: [ master, development ]
+ branches: [ master, development, pull-request/* ]
  pull_request:
- branches: [ master ]
+ branches: [ master, pull-request/* ]
 
 jobs:
  build-gcc-cpp03-linux-STL:

diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml
@@ -1,9 +1,9 @@
 name: gcc
 on:
  push:
- branches: [ master, development ]
+ branches: [ master, development, pull-request/* ]
  pull_request:
- branches: [ master ]
+ branches: [ master, pull-request/* ]
 
 jobs:
  build-gcc-cpp11-linux-stl:

diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
@@ -1,9 +1,9 @@
 name: msvc
 on:
  push:
- branches: [ master, development ]
+ branches: [ master, development, pull-request/* ]
  pull_request:
- branches: [ master ]
+ branches: [ master, pull-request/* ]
 
 jobs:
  build-windows-msvc-stl:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -73,9 +73,10 @@ if(${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME})
  "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
  install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/etl DESTINATION include)
-
- if (BUILD_TESTS)
- enable_testing()
- add_subdirectory(test) 
- endif()
+
+endif()
+
+if (BUILD_TESTS)
+ enable_testing()
+ add_subdirectory(test)
 endif()
diff --git a/include/etl/private/diagnostic_stringop_overread_push.h b/include/etl/private/diagnostic_stringop_overread_push.h
@@ -33,11 +33,11 @@ SOFTWARE.
  * This file is intended to evaluated multiple times by design.
  */
 
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__llvm__)
- #pragma GCC diagnostic push 
+#if defined(__GNUC__) && (__GNUC__ >= 11) && !defined(__clang__) && !defined(__llvm__)
+ #pragma GCC diagnostic push
  #pragma GCC diagnostic ignored "-Wstringop-overread"
 #endif
 
 #if defined(__clang__) || defined(__llvm__)
- #pragma clang diagnostic push 
-#endif
+ #pragma clang diagnostic push
+#endif