File tree Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -78,7 +78,8 @@ if(WIN32)
78
78
if (CMAKE_SIZEOF_VOID_P EQUAL 4 )
79
79
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} )
80
80
else ()
81
- if (${CMAKE_SYSTEM_PROCESSOR} MATCHES arm )
81
+ get_filename_component (COMPILER_DIR ${CMAKE_CXX_COMPILER} DIRECTORY )
82
+ if (${COMPILER_DIR} MATCHES arm )
82
83
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} )
83
84
else ()
84
85
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} )
Original file line number Diff line number Diff line change @@ -124,7 +124,7 @@ namespace vx {
124
124
while ( ( resultCode = sqlite3_step ( statement.get () ) ) == SQLITE_ROW ) {
125
125
126
126
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 ) );
128
128
}
129
129
if ( resultCode != SQLITE_DONE ) {
130
130
You can’t perform that action at this time.
0 commit comments