diff --git a/CMakeLists.txt b/CMakeLists.txt index f60846e98aa9ca36bd6bd68cccdda6e3d2ff616a..bd2299f2a7aff101c5760492070bf5bdea4eca7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,26 +14,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY build) file(GLOB_RECURSE PADDLE_MOBILE_CC src/*.cc src/*.cpp src/*.c) file(GLOB_RECURSE PADDLE_MOBILE_H src/*.h) -# include headers include_directories(src/) -#include(ExternalProject) -#ExternalProject_Add(openblas_proj -# GIT_REPOSITORY "https://github.com/xianyi/OpenBLAS.git" -# GIT_TAG "v0.2.20" -# SOURCE_DIR "openblas/" -# BUILD_IN_SOURCE 1 -# CONFIGURE_COMMAND "" -# BUILD_COMMAND "make" "ONLY_CBLAS=1" -# INSTALL_COMMAND "make" "PREFIX=${CMAKE_BINARY_DIR}/" "install" -# ) -#set_target_properties(openblas_proj PROPERTIES EXCLUDE_FROM_ALL 1) - -#add_dependencies(paddle-mobile openblas_proj) - -# gen static -ADD_LIBRARY(paddle-mobile SHARED ${PADDLE_MOBILE_CC} ${PADDLE_MOBILE_H}) - -#add_dependencies(paddle-mobile openblas_proj) +add_library(paddle-mobile SHARED ${PADDLE_MOBILE_CC} ${PADDLE_MOBILE_H}) add_subdirectory(test) diff --git a/build.sh b/build.sh index dc31f3b47f47975309e46c063bee142d1cc1a14f..d9c462ca7c218a67964172fa7970a765ffea764d 100755 --- a/build.sh +++ b/build.sh @@ -38,8 +38,9 @@ build_for_android() { exit -1 fi - PLATFORM="arm-v7a" -# PLATFORM="arm-v8a" + if [ -z "$PLATFORM" ]; then + PLATFORM="arm-v7a" # Users could choose "arm-v8a" or other platforms from the command line. + fi if [ "${PLATFORM}" = "arm-v7a" ]; then ABI="armeabi-v7a with NEON"