Skip to content

Commit 594ac11

Browse files
committed
Correct a unittest precision
Try to fix the arm64 windows build
1 parent 17c27f9 commit 594ac11

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

cmake/external/icu.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ if(WIN32)
7878
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
7979
set(ICU_BUILD_COMMAND msbuild ${ICU_SRC}/src/ICU/source/allinone/allinone.sln /p:Configuration=${CMAKE_BUILD_TYPE} /p:Platform=Win32 /p:SkipUWP=true /m:${CPU_COUNT})
8080
else()
81-
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES arm)
81+
get_filename_component(COMPILER_DIR ${CMAKE_CXX_COMPILER} DIRECTORY)
82+
if(${COMPILER_DIR} MATCHES arm)
8283
set(ICU_BUILD_COMMAND msbuild ${ICU_SRC}/src/ICU/source/allinone/allinone.sln /p:Configuration=${CMAKE_BUILD_TYPE} /p:Platform=ARM64 /p:SkipUWP=true /m:${CPU_COUNT})
8384
else()
8485
set(ICU_BUILD_COMMAND msbuild ${ICU_SRC}/src/ICU/source/allinone/allinone.sln /p:Configuration=${CMAKE_BUILD_TYPE} /p:Platform=x64 /p:SkipUWP=true /m:${CPU_COUNT})

tests/test_distance.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ namespace vx {
124124
while ( ( resultCode = sqlite3_step( statement.get() ) ) == SQLITE_ROW ) {
125125

126126
const double distance = sqlite3_column_double( statement.get(), 0 );
127-
EXPECT_TRUE( floating_point::equal( distance, 504.100899610037 ) );
127+
EXPECT_TRUE( floating_point::equal( distance, 504.10089961002807968 ) );
128128
}
129129
if ( resultCode != SQLITE_DONE ) {
130130

0 commit comments

Comments
 (0)