File tree Expand file tree Collapse file tree 2 files changed +4
-5
lines changed Expand file tree Collapse file tree 2 files changed +4
-5
lines changed Original file line number Diff line number Diff line change @@ -3,17 +3,16 @@ cmake_minimum_required(VERSION 2.8...3.16)
3
3
set (TARGET scadup )
4
4
project (${TARGET} C CXX )
5
5
6
- set (CMAKE_CXX_STANDARD 11 )
7
6
if (NOT WIN32 )
8
7
set (OPTION "-fPIC -g -ggdb" )
9
8
if (NOT "${ANDROID} " EQUAL "1" )
10
- set (OPTION "${OPTION} -std=c++11" )
11
9
set (EXTERN pthread )
12
10
endif ()
13
11
endif ()
14
12
set (CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -O0 -Wall" )
15
13
set (CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -O3 -Wall" )
16
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x" )
14
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" )
15
+ #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
17
16
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs")
18
17
add_definitions (${OPTION} )
19
18
Original file line number Diff line number Diff line change 1
1
cmake_minimum_required (VERSION 2.8...3.16 )
2
2
3
3
project (test C CXX )
4
- set ( CMAKE_CXX_STANDARD 11 )
4
+
5
5
if (NOT WIN32 )
6
6
set (OPTION "-fPIC -g -ggdb" )
7
7
if (NOT "${ANDROID} " EQUAL "1" )
8
- set (OPTION "${OPTION} -std=c++11" )
9
8
set (EXTERN pthread )
10
9
endif ()
11
10
endif ()
12
11
add_definitions (${OPTION} )
12
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" )
13
13
14
14
set (TARGET test )
15
15
file (GLOB TEST_FILE "*test*.*" )
You can’t perform that action at this time.
0 commit comments