未验证 提交 077f5f88 编写于 作者: Y yangfei963158659 提交者: GitHub

Merge branch 'develop' into develop

cmake_minimum_required(VERSION 3.6) cmake_minimum_required(VERSION 3.6)
option(USE_OPENMP "openmp support" ON) option(USE_OPENMP "openmp support" ON)
option(DEBUGING "enable debug mode" ON) option(DEBUGING "enable debug mode" OFF)
option(USE_EXCEPTION "use std exception" ON) option(USE_EXCEPTION "use std exception" ON)
option(SYMBOL_HIDDEN "symbol hidden" OFF) # on when use jni or ios io
option(LOG_PROFILE "log profile" OFF) option(LOG_PROFILE "log profile" OFF)
# select the platform to build # select the platform to build
option(CPU "armv7 with neon" ON) option(CPU "armv7 with neon" ON)
...@@ -10,6 +11,7 @@ option(GPU_MALI "mali gpu" OFF) ...@@ -10,6 +11,7 @@ option(GPU_MALI "mali gpu" OFF)
option(GPU_CL "opencl gpu" ON) option(GPU_CL "opencl gpu" ON)
option(FPGA "fpga" OFF) option(FPGA "fpga" OFF)
project(paddle-mobile) project(paddle-mobile)
file(GLOB_RECURSE PADDLE_MOBILE_CC src/*.cc src/*.cpp src/*.c src/*.mm) file(GLOB_RECURSE PADDLE_MOBILE_CC src/*.cc src/*.cpp src/*.c src/*.mm)
...@@ -30,10 +32,10 @@ if(DEBUGING) ...@@ -30,10 +32,10 @@ if(DEBUGING)
message(STATUS "debugging mode") message(STATUS "debugging mode")
add_definitions(-DPADDLE_MOBILE_DEBUG) add_definitions(-DPADDLE_MOBILE_DEBUG)
else() else()
if(FPGA) endif()
else()
add_definitions(-fvisibility=hidden -fvisibility-inlines-hidden) if(SYMBOL_HIDDEN)
endif() add_definitions(-fvisibility=hidden -fvisibility-inlines-hidden)
endif() endif()
if(USE_EXCEPTION) if(USE_EXCEPTION)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册