diff --git a/cmake/external/flatbuffers.cmake b/cmake/external/flatbuffers.cmake index 4c2413c620d3531399ceede234eed16e9f4f0b6b..47b3042234cfa482ca7187baf8e51275ea8d3ac8 100644 --- a/cmake/external/flatbuffers.cmake +++ b/cmake/external/flatbuffers.cmake @@ -27,7 +27,7 @@ SET(FLATBUFFERS_SOURCES_DIR ${CMAKE_SOURCE_DIR}/third-party/flatbuffers) SET(FLATBUFFERS_INSTALL_DIR ${THIRD_PARTY_PATH}/install/flatbuffers) SET(FLATBUFFERS_INCLUDE_DIR "${FLATBUFFERS_SOURCES_DIR}/include" CACHE PATH "flatbuffers include directory." FORCE) IF(WIN32) - set(FLATBUFFERS_LIBRARIES "${FLATBUFFERS_INSTALL_DIR}/${LIBDIR}/libflatbuffers.lib" CACHE FILEPATH "FLATBUFFERS_LIBRARIES" FORCE) + set(FLATBUFFERS_LIBRARIES "${FLATBUFFERS_INSTALL_DIR}/${LIBDIR}/flatbuffers.lib" CACHE FILEPATH "FLATBUFFERS_LIBRARIES" FORCE) ELSE(WIN32) set(FLATBUFFERS_LIBRARIES "${FLATBUFFERS_INSTALL_DIR}/${LIBDIR}/libflatbuffers.a" CACHE FILEPATH "FLATBUFFERS_LIBRARIES" FORCE) ENDIF(WIN32) @@ -64,13 +64,6 @@ ExternalProject_Add( -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE} ) -IF(WIN32) - IF(NOT EXISTS "${FLATBUFFERS_INSTALL_DIR}/${LIBDIR}/libflatbuffers.lib") - add_custom_command(TARGET extern_flatbuffers POST_BUILD - COMMAND cmake -E copy ${FLATBUFFERS_INSTALL_DIR}/${LIBDIR}/flatbuffers_static.lib ${FLATBUFFERS_INSTALL_DIR}/${LIBDIR}/libflatbuffers.lib - ) - ENDIF() -ENDIF(WIN32) ADD_LIBRARY(flatbuffers STATIC IMPORTED GLOBAL) SET_PROPERTY(TARGET flatbuffers PROPERTY IMPORTED_LOCATION ${FLATBUFFERS_LIBRARIES}) ADD_DEPENDENCIES(flatbuffers extern_flatbuffers) diff --git a/lite/backends/x86/cpu_info.cc b/lite/backends/x86/cpu_info.cc index 276b62654f3c8b25d23e629c706e4877dabc3889..3ba8dc50783b2118564fc24f802053e4d414aace 100644 --- a/lite/backends/x86/cpu_info.cc +++ b/lite/backends/x86/cpu_info.cc @@ -24,6 +24,7 @@ #include #elif defined(_WIN32) #define NOMINMAX // msvc max/min macro conflict with std::min/max +#define GLOG_NO_ABBREVIATED_SEVERITIES #include #else #include diff --git a/lite/utils/charconv.h b/lite/utils/charconv.h index ee458e549c149b98ceb9101aabae87e27350e897..8ff0f4850daa06c259d1ad4c6909a9c75ec9e6fc 100644 --- a/lite/utils/charconv.h +++ b/lite/utils/charconv.h @@ -156,10 +156,11 @@ from_chars_result aton_unsigned(const char* str, } val += cv; } - if (UNLIKELY(i > std::numeric_limits::digits10 + 1 || - (i > std::numeric_limits::digits10 && - val > static_cast(std::numeric_limits::max())))) { - value = static_cast(std::numeric_limits::max()); + if (UNLIKELY( + i > std::numeric_limits::digits10 + 1 || + (i > std::numeric_limits::digits10 && + val > static_cast((std::numeric_limits::max)())))) { + value = static_cast((std::numeric_limits::max)()); result.ec = std::errc::result_out_of_range; return result; } @@ -209,10 +210,11 @@ from_chars_result aton_signed(const char* str, val += cv; } if (LIKELY(!negative)) { - if (UNLIKELY(i > std::numeric_limits::digits10 + 1 || - (i > std::numeric_limits::digits10 && - val > static_cast(std::numeric_limits::max())))) { - value = static_cast(std::numeric_limits::max()); + if (UNLIKELY( + i > std::numeric_limits::digits10 + 1 || + (i > std::numeric_limits::digits10 && + val > static_cast((std::numeric_limits::max)())))) { + value = static_cast((std::numeric_limits::max)()); result.ec = std::errc::result_out_of_range; return result; }