p85620714
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix gtest cmake bug

This commit is contained in:
yeyunpeng2020 2021-03-11 14:07:38 +08:00
parent 95dd988807
commit 3dbeca94ba
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/external_libs/gtest.cmake
View File

@ -11,7 +11,7 @@ if(BUILD_LITE)
-DANDROID_NDK=$ENV{ANDROID_NDK}
-DANDROID_ABI=arm64-v8a
-DANDROID_TOOLCHAIN_NAME=aarch64-linux-android-clang
-DANDROID_STL=c++_shared -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DANDROID_STL=c++_shared
${CMAKE_OPTION})
endif()
if(PLATFORM_ARM32)
@ -20,7 +20,7 @@ if(BUILD_LITE)
-DANDROID_NDK=$ENV{ANDROID_NDK}
-DANDROID_ABI=armeabi-v7a
-DANDROID_TOOLCHAIN_NAME=aarch64-linux-android-clang
-DANDROID_STL=c++_shared -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DANDROID_STL=c++_shared
${CMAKE_OPTION})
endif()
else()

4
mindspore/lite/examples/quick_start_java/src/main/java/com/mindspore/lite/demo/Main.java
View File

@ -37,8 +37,8 @@ public class Main {
}
private static boolean compile() {
MSConfig msConfig = new MSConfig(DeviceType.DT_CPU, 2);
boolean ret = msConfig.init();
MSConfig msConfig = new MSConfig();
boolean ret = msConfig.init(DeviceType.DT_CPU, 2);
if (!ret) {
System.err.println("Init context failed");
return false;