Skip to content

Commit 4ad6f86

Browse files
Development/don't touch c,cxx flags (#488)
1 parent a4d8a64 commit 4ad6f86

File tree

5 files changed

+4
-25
lines changed

5 files changed

+4
-25
lines changed

.github/workflows/Build ThunderInterfaces on Linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
ThunderInterfaces:
1818
needs: Thunder
19-
uses: rdkcentral/ThunderInterfaces/.github/workflows/Linux build template.yml@master
19+
uses: ./.github/workflows/Linux build template.yml
2020

2121
ThunderClientLibraries:
2222
needs: ThunderInterfaces

.github/workflows/Build ThunderInterfaces on MacOS.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
ThunderInterfaces_MacOS:
1818
needs: Thunder_MacOS
19-
uses: rdkcentral/ThunderInterfaces/.github/workflows/MacOS build template.yml@master
19+
uses: ./.github/workflows/MacOS build template.yml
2020

2121
ThunderClientLibraries_MacOS:
2222
needs: ThunderInterfaces_MacOS

.github/workflows/Linux build template.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ jobs:
104104
run: |
105105
source venv/bin/activate
106106
cmake -G Ninja -S ThunderInterfaces -B ${{matrix.build_type}}/build/ThunderInterfaces \
107-
-DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
108-
-DCMAKE_C_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
107+
-DCMAKE_CXX_FLAGS="-m${{matrix.architecture}}" \
108+
-DCMAKE_C_FLAGS="-m${{matrix.architecture}}" \
109109
-DCMAKE_INSTALL_PREFIX="${{matrix.build_type}}/install/usr" \
110110
-DCMAKE_MODULE_PATH="${PWD}/${{matrix.build_type}}/install/usr/include/WPEFramework/Modules"
111111
cmake --build ${{matrix.build_type}}/build/ThunderInterfaces --target install

.github/workflows/MacOS build template.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ jobs:
6767
run: |
6868
source venv/bin/activate
6969
cmake -G Ninja -S ThunderInterfaces -B ${{matrix.build_type}}/build/ThunderInterfaces \
70-
-DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Werror" \
71-
-DCMAKE_C_FLAGS="-Wall -Wextra -Wpedantic -Werror" \
7270
-DCMAKE_INSTALL_PREFIX="${{matrix.build_type}}/install/usr" \
7371
-DCMAKE_MODULE_PATH="${PWD}/${{matrix.build_type}}/install/usr/include/WPEFramework/Modules"
7472
cmake --build ${{matrix.build_type}}/build/ThunderInterfaces --target install

CMakeLists.txt

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,6 @@ find_package(Thunder)
2424
set(INTERFACES_PATTERNS "I*.h" CACHE STRING "Patterns matching files for which stubs should be generated")
2525
set(JSONRPC_PATTERNS "*.json" CACHE STRING "Patterns matching files for which json stubs should be generated")
2626

27-
if(ENABLE_STRICT_COMPILER_SETTINGS)
28-
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
29-
message(FATAL_ERROR "Compiling with Clang")
30-
set(CMAKE_STRICT_COMPILER_SETTINGS "-Weverything -Wextra -Wpedantic -Werror")
31-
set(CMAKE_STRICT_CXX_COMPILER_SETTINGS "${CMAKE_STRICT_COMPILER_SETTINGS} -Wnon-virtual-dtor")
32-
elseif(${CMAKE_COMPILER_IS_GNUCXX})
33-
message(STATUS "Compiling with GCC")
34-
set(CMAKE_STRICT_COMPILER_SETTINGS "-Wall -Wextra -Wpedantic -Werror")
35-
set(CMAKE_STRICT_CXX_COMPILER_SETTINGS "${CMAKE_STRICT_COMPILER_SETTINGS} -Wnon-virtual-dtor")
36-
elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
37-
message(STATUS "Compiling with MS Visual Studio")
38-
set(CMAKE_STRICT_COMPILER_SETTINGS "/W4")
39-
else()
40-
message(STATUS "Compiler ${CMAKE_CXX_COMPILER_ID}")
41-
endif()
42-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_STRICT_CXX_COMPILER_SETTINGS}")
43-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_STRICT_COMPILER_SETTINGS}")
44-
endif()
45-
4627
if (BUILD_REFERENCE)
4728
add_definitions (-DBUILD_REFERENCE=${BUILD_REFERENCE})
4829
endif()

0 commit comments

Comments
 (0)