diff --git a/CMakeLists.txt b/CMakeLists.txt index 89fbe0b668a8339fe59fb419f9324973e82849d7..99032ada82dc6c0e085bc9d4e6b98ee204f63d33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,8 +17,10 @@ elseif(FPGA) add_definitions(-DPADDLE_MOBILE_FPGA) endif() +set(CMAKE_CXX_FLAGS "-std=c++14 -O3 -s ${CMAKE_CXX_FLAGS}") if (DEBUGING) set(CMAKE_BUILD_TYPE Debug) + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS}") else() set(CMAKE_BUILD_TYPE Release) endif () @@ -55,7 +57,6 @@ else () add_definitions(-DX86) endif() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY build) diff --git a/tools/build.sh b/tools/build.sh index 580508c7ed17f4e2c76769e601521b6f4b25b5ba..4ac63315a94798d3aca63fb62aef511c4146cd3c 100755 --- a/tools/build.sh +++ b/tools/build.sh @@ -15,7 +15,6 @@ build_for_mac() { fi PLATFORM="x86" MODE="Release" - CXX_FLAGS="-std=c++11 -O3 -s" BUILD_DIR=../build/release/"${PLATFORM}" mkdir -p ${BUILD_DIR}/build @@ -25,7 +24,6 @@ build_for_mac() { cmake .. \ -B"${BUILD_DIR}" \ -DCMAKE_BUILD_TYPE="${MODE}" \ - -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" \ -DIS_MAC=true cd ${BUILD_DIR} @@ -46,11 +44,11 @@ build_for_android() { if [ "${PLATFORM}" = "arm-v7a" ]; then ABI="armeabi-v7a with NEON" ARM_PLATFORM="V7" - CXX_FLAGS="-O3 -std=c++11 -s -march=armv7-a -mfpu=neon -mfloat-abi=softfp -pie -fPIE -w -Wno-error=format-security" + CXX_FLAGS="-march=armv7-a -mfpu=neon -mfloat-abi=softfp -pie -fPIE -w -Wno-error=format-security" elif [ "${PLATFORM}" = "arm-v8a" ]; then ABI="arm64-v8a" ARM_PLATFORM="V8" - CXX_FLAGS="-O3 -std=c++11 -s -march=armv8-a -pie -fPIE -w -Wno-error=format-security -llog" + CXX_FLAGS="-march=armv8-a -pie -fPIE -w -Wno-error=format-security -llog" else echo "unknown platform!" exit -1