Skip to content

Commit 1c3f0da

Browse files
committed
[mod] fix clang build
1 parent 155b30f commit 1c3f0da

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/scadup/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@ cmake_minimum_required(VERSION 2.8...3.16)
33
set(TARGET scadup)
44
project(${TARGET} C CXX)
55

6-
set(CMAKE_CXX_STANDARD 11)
76
if (NOT WIN32)
87
set(OPTION "-fPIC -g -ggdb")
98
if (NOT "${ANDROID}" EQUAL "1")
10-
set(OPTION "${OPTION} -std=c++11")
119
set(EXTERN pthread)
1210
endif()
1311
endif()
1412
set(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -O0 -Wall")
1513
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")
1716
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs")
1817
add_definitions(${OPTION})
1918

test/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
cmake_minimum_required(VERSION 2.8...3.16)
22

33
project(test C CXX)
4-
set(CMAKE_CXX_STANDARD 11)
4+
55
if (NOT WIN32)
66
set(OPTION "-fPIC -g -ggdb")
77
if (NOT "${ANDROID}" EQUAL "1")
8-
set(OPTION "${OPTION} -std=c++11")
98
set(EXTERN pthread)
109
endif()
1110
endif()
1211
add_definitions(${OPTION})
12+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
1313

1414
set(TARGET test)
1515
file(GLOB TEST_FILE "*test*.*")

0 commit comments

Comments
 (0)