8000 reactivate warnings as errors (#10286) · arangodb/arangodb@2cd7330 · GitHub
[go: up one dir, main page]
Skip to content

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 2cd7330

Browse files
jsteemannKVS85
jsteemann
authored and
KVS85
committed
reactivate warnings as errors (#10286)
* reactivate warnings as errors * rename option, so it doesn't clash with RocksDB's own option
1 parent c3d8ef8 commit 2cd7330

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ option(SKIP_PACKAGING "" OFF)
4646
option(VERBOSE "be verbose about flags used" OFF)
4747

4848
# treat warnings as errors on some platforms
49-
option(FAIL_ON_WARNINGS "treat warnings as errors" OFF)
49+
option(USE_FAIL_ON_WARNINGS "treat warnings as errors (MSVC and MacOS only)" ON)
5050

5151
# don't use standalone boost asio
5252
# use this when asio is included outside of Boost

‎arangod/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -985,11 +985,11 @@ foreach(TARGET
985985
)
986986
target_include_directories(${TARGET} PUBLIC "${PROJECT_SOURCE_DIR}/${ENTERPRISE_INCLUDE_DIR}")
987987

988-
if(MSVC AND FAIL_ON_WARNINGS)
988+
if (MSVC AND USE_FAIL_ON_WARNINGS)
989989
target_compile_options(${TARGET} PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
990-
elseif(DARWIN AND FAIL_ON_WARNINGS)
990+
elseif (DARWIN AND USE_FAIL_ON_WARNINGS)
991991
target_compile_options(${TARGET} PRIVATE -Werror)
992-
endif()
992+
endif ()
993993
endforeach()
994994

995995
################################################################################

‎arangosh/CMakeLists.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ if (USE_JEMALLOC)
7878
add_dependencies(arangobench jemalloc)
7979
endif ()
8080

81-
if(MSVC AND FAIL_ON_WARNINGS)
81+
if(MSVC AND USE_FAIL_ON_WARNINGS)
8282
target_compile_options(arangobench PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
8383
endif()
8484

85-
if (DARWIN AND FAIL_ON_WARNINGS)
85+
if (DARWIN AND USE_FAIL_ON_WARNINGS)
8686
target_compile_options(arangobench PRIVATE -Werror)
8787
endif()
8888

@@ -137,11 +137,11 @@ if (USE_JEMALLOC)
137137
add_dependencies(arangobackup jemalloc)
138138
endif ()
139139

140-
if(MSVC AND FAIL_ON_WARNINGS)
140+
if(MSVC AND USE_FAIL_ON_WARNINGS)
141141
target_compile_options(arangobackup PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
142142
endif()
143143

144-
if (DARWIN AND FAIL_ON_WARNINGS)
144+
if (DARWIN AND 10000 USE_FAIL_ON_WARNINGS)
145145
target_compile_options(arangobackup PRIVATE -Werror)
146146
endif()
147147

@@ -196,11 +196,11 @@ if (USE_JEMALLOC)
196196
add_dependencies(arangodump jemalloc)
197197
endif ()
198198

199-
if(MSVC AND FAIL_ON_WARNINGS)
199+
if(MSVC AND USE_FAIL_ON_WARNINGS)
200200
target_compile_options(arangodump PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
201201
endif()
202202

203-
if (DARWIN AND FAIL_ON_WARNINGS)
203+
if (DARWIN AND USE_FAIL_ON_WARNINGS)
204204
target_compile_options(arangodump PRIVATE -Werror)
205205
endif()
206206

@@ -252,11 +252,11 @@ if (USE_JEMALLOC)
252252
add_dependencies(arangoexport jemalloc)
253253
endif ()
254254

255-
if(MSVC AND FAIL_ON_WARNINGS)
255+
if(MSVC AND USE_FAIL_ON_WARNINGS)
256256
target_compile_options(arangoexport PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
257257
endif()
258258

259-
if (DARWIN AND FAIL_ON_WARNINGS)
259+
if (DARWIN AND USE_FAIL_ON_WARNINGS)
260260
target_compile_options(arangoexport PRIVATE -Werror)
261261
endif()
262262

@@ -320,11 +320,11 @@ install_command_alias(arangoimport
320320
arangoimp
321321
)
322322

323-
if(MSVC AND FAIL_ON_WARNINGS)
323+
if(MSVC AND USE_FAIL_ON_WARNINGS)
324324
target_compile_options(arangoimport PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
325325
endif()
326326

327-
if (DARWIN AND FAIL_ON_WARNINGS)
327+
if (DARWIN AND USE_FAIL_ON_WARNINGS)
328328
target_compile_options(arangoimport PRIVATE -Werror)
329329
endif()
330330

@@ -377,11 +377,11 @@ if (USE_JEMALLOC)
377377
add_dependencies(arangorestore jemalloc)
378378
endif ()
379379

380-
if(MSVC AND FAIL_ON_WARNINGS)
380+
if(MSVC AND USE_FAIL_ON_WARNINGS)
381381
target_compile_options(arangorestore PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
382382
endif()
383383

384-
if (DARWIN AND FAIL_ON_WARNINGS)
384+
if (DARWIN AND USE_FAIL_ON_WARNINGS)
385385
target_compile_options(arangorestore PRIVATE -Werror)
386386
endif()
387387

@@ -442,11 +442,11 @@ if (USE_JEMALLOC)
442442
add_dependencies(arangosh jemalloc)
443443
endif ()
444444

445-
if(MSVC AND FAIL_ON_WARNINGS)
445+
if(MSVC AND USE_FAIL_ON_WARNINGS)
446446
target_compile_options(arangosh PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
447447
endif()
448448

449-
if (DARWIN AND FAIL_ON_WARNINGS)
449+
if (DARWIN AND USE_FAIL_ON_WARNINGS)
450450
target_compile_options(arangosh PRIVATE -Werror)
451451
endif()
452452

@@ -498,11 +498,11 @@ if (USE_JEMALLOC)
498498
add_dependencies(arangovpack jemalloc)
499499
endif ()
500500

501-
if(MSVC AND FAIL_ON_WARNINGS)
501+
if(MSVC AND USE_FAIL_ON_WARNINGS)
502502
target_compile_options(arangovpack PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
503503
endif()
504504

505-
if (DARWIN AND FAIL_ON_WARNINGS)
505+
if (DARWIN AND USE_FAIL_ON_WARNINGS)
506506
target_compile_options(arangovpack PRIVATE -Werror)
507507
endif()
508508

‎lib/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,13 +298,13 @@ if (USE_ENTERPRISE)
298298
target_include_directories(arango_v8 PUBLIC "${PROJECT_SOURCE_DIR}/${ENTERPRISE_INCLUDE_DIR}")
299299
endif()
300300

301-
if(MSVC AND FAIL_ON_WARNINGS)
301+
if (MSVC AND USE_FAIL_ON_WARNINGS)
302302
target_compile_options(arango_v8 PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
303303
target_compile_options(arango_geo PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
304304
target_compile_options(arango PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
305305
endif()
306306

307-
if (DARWIN AND FAIL_ON_WARNINGS)
307+
if (DARWIN AND USE_FAIL_ON_WARNINGS)
308308
target_compile_options(arango_v8 PRIVATE -Werror)
309309
target_compile_options(arango_geo PRIVATE -Werror)
310310
target_compile_options(arango PRIVATE -Werror)

0 commit comments

Comments
 (0)
0