Skip to content

Commit 6392e84

Browse files
fix ci
1 parent 0ecf9a4 commit 6392e84

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
255255
set(COLOR_FLAG "")
256256
endif()
257257
# using GCC
258-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${COLOR_FLAG} -fPIC -ftemplate-depth=1024")
258+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${COLOR_FLAG} -fPIC -ftemplate-depth=1024 -fcompare-debug-second")
259259

260260
if(WIN32) # using mingw
261261
add_dependency_defines(-DWIN32)
@@ -268,6 +268,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
268268
# using Visual Studio C++
269269
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") # avoid compiler error C1128 from scripting_environment_lua.cpp
270270
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32_LEAN_AND_MEAN") # avoid compiler error C2011 from dual #include of winsock.h and winsock2.h
271+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4625 /wd4626 /wd5026 /wd5027 /wd4820") # avoid flooding the github build log
271272
add_dependency_defines(-DBOOST_LIB_DIAGNOSTIC)
272273
add_dependency_defines(-D_CRT_SECURE_NO_WARNINGS)
273274
add_dependency_defines(-DNOMINMAX) # avoid min and max macros that can break compilation
@@ -277,6 +278,9 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
277278
target_link_libraries(osrm-extract wsock32 ws2_32)
278279
endif()
279280

281+
message(STATUS "CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}")
282+
message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
283+
280284
if(UNIX AND NOT APPLE)
281285
find_library(RT_LIB rt)
282286
if (RT_LIB)

cmake/warnings.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,6 @@ no_warning(restrict)
8585
no_warning(free-nonheap-object)
8686
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
8787
no_warning(stringop-overflow)
88-
endif()
88+
no_warning(uninitialized)
89+
no_warning(array-bounds)
90+
endif()

unit_tests/library/extract.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ BOOST_AUTO_TEST_CASE(test_extract_with_valid_config_and_areas)
5656
config.profile_path = OSRM_TEST_DATA_DIR "/../../profiles/foot_area.lua";
5757
config.small_component_size = 1000;
5858
config.requested_num_threads = std::thread::hardware_concurrency();
59-
BOOST_CHECK_NO_THROW(osrm::extract(config));
6059
osrm::extract(config);
60+
BOOST_CHECK_NO_THROW(osrm::extract(config));
6161
}
6262

6363
BOOST_AUTO_TEST_CASE(test_setup_runtime_error)

0 commit comments

Comments
 (0)