Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite963b4a

Browse files
committed
Removing redundant compiler checks.
1 parent9412dba commite963b4a

File tree

5 files changed

+2
-65
lines changed

5 files changed

+2
-65
lines changed

‎CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
5757
list(APPENDCMAKE_CXX_LINK_FLAGS"-std=c++11")
5858
else()
5959
list(APPENDCMAKE_CXX_FLAGS"-std=c++11 -stdlib=libc++ -Wall")
60-
list(APPENDCMAKE_CXX_LINK_FLAGS"-std=c++11 -stdlib=libc++")
6160
endif()
6261
else()
6362
message(FATAL_ERROR"No C++11 support for Clang version. Please upgrade Clang to a version supporting C++11.")

‎concurrency/src/CMakeLists.txt

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,5 @@
55

66
include_directories(${CPP-NETLIB_SOURCE_DIR}/concurrency/src)
77

8-
if (${CMAKE_CXX_COMPILER_ID}MATCHESGNU)
9-
set(CPP-NETLIB_CXXFLAGS"-Wall -std=c++11")
10-
elseif (${CMAKE_CXX_COMPILER_ID}MATCHESClang)
11-
CHECK_CXX_COMPILER_FLAG(-std=c++11HAVE_STD11)
12-
if (CPP-NETLIB_DISABLE_LIBCXX)
13-
set(CPP-NETLIB_CXXFLAGS"-Wall -std=c++11")
14-
else()
15-
set(CPP-NETLIB_CXXFLAGS"-Wall -std=c++11 -stdlib=libc++")
16-
endif()
17-
endif()
18-
198
set(CPP-NETLIB_CONCURRENCY_SRCSthread_pool.cpp)
209
add_library(cppnetlib-concurrency${CPP-NETLIB_CONCURRENCY_SRCS})
21-
foreach (src_file${CPP-NETLIB_CONCURRENCY_SRCS})
22-
if (${CMAKE_CXX_COMPILER_ID}MATCHESGNU)
23-
set_source_files_properties(${src_file}
24-
PROPERTIESCOMPILE_FLAGS${CPP-NETLIB_CXXFLAGS})
25-
elseif (${CMAKE_CXX_COMPILER_ID}MATCHESClang)
26-
set_source_files_properties(${src_file}
27-
PROPERTIESCOMPILE_FLAGS${CPP-NETLIB_CXXFLAGS})
28-
endif()
29-
endforeach(src_file)

‎concurrency/test/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ include_directories(${CPP-NETLIB_SOURCE_DIR}/concurrency/src
77
${GTEST_INCLUDE_DIRS}
88
)
99

10-
set_source_files_properties(thread_pool_test.cpp
11-
PROPERTIESCOMPILE_FLAGS"-Wall")
1210
add_executable(cpp-netlib-thread_pool_testthread_pool_test.cpp)
1311
target_link_libraries(cpp-netlib-thread_pool_test
1412
cppnetlib-concurrency

‎message/src/CMakeLists.txt

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,19 @@
11
# Copyright (c) Glyn Matthews 2012.
2+
# Copyright 2013, Dean Michael Berris 2013 <dberris@google.com>
3+
# Copyright 2013, Google, Inc.
24
# Distributed under the Boost Software License, Version 1.0.
35
# (See accompanying file LICENSE_1_0.txt or copy at
46
# http://www.boost.org/LICENSE_1_0.txt)
57

6-
if (${CMAKE_CXX_COMPILER_ID}MATCHESGNU)
7-
set(CPP-NETLIB_CXXFLAGS"-Wall -std=c++11")
8-
elseif (${CMAKE_CXX_COMPILER_ID}MATCHESClang)
9-
CHECK_CXX_COMPILER_FLAG(-std=c++11HAVE_STD11)
10-
if (CPP-NETLIB_DISABLE_LIBCXX)
11-
set(CPP-NETLIB_CXXFLAGS"-Wall -std=c++11")
12-
else()
13-
set(CPP-NETLIB_CXXFLAGS"-Wall -std=c++11 -stdlib=libc++")
14-
endif()
15-
endif()
16-
178
include_directories(${CPP-NETLIB_SOURCE_DIR}/uri/src${CPP-NETLIB_SOURCE_DIR}/message/src)
189

1910
set(CPP-NETLIB_MESSAGE_SRCSmessage.cpp)
2011
add_library(cppnetlib-message${CPP-NETLIB_MESSAGE_SRCS})
2112
add_dependencies(cppnetlib-messagecppnetlib-uri)
2213
target_link_libraries(cppnetlib-messagecppnetlib-uri)
23-
foreach (src_file${CPP-NETLIB_MESSAGE_SRCS})
24-
if (${CMAKE_CXX_COMPILER_ID}MATCHESGNU)
25-
set_source_files_properties(${src_file}
26-
PROPERTIESCOMPILE_FLAGS${CPP-NETLIB_CXXFLAGS})
27-
elseif (${CMAKE_CXX_COMPILER_ID}MATCHESClang)
28-
set_source_files_properties(${src_file}
29-
PROPERTIESCOMPILE_FLAGS${CPP-NETLIB_CXXFLAGS})
30-
endif()
31-
endforeach(src_file)
3214

3315
set(CPP-NETLIB_MESSAGE_DIRECTIVES_SRCSdirectives.cpp)
3416
add_library(cppnetlib-message-directives${CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS})
35-
foreach (src_file${CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS})
36-
if (${CMAKE_CXX_COMPILER_ID}MATCHESGNU)
37-
set_source_files_properties(${src_file}
38-
PROPERTIESCOMPILE_FLAGS${CPP-NETLIB_CXXFLAGS})
39-
elseif (${CMAKE_CXX_COMPILER_ID}MATCHESClang)
40-
set_source_files_properties(${src_file}
41-
PROPERTIESCOMPILE_FLAGS${CPP-NETLIB_CXXFLAGS})
42-
endif()
43-
endforeach(src_file)
4417

4518
set(CPP-NETLIB_MESSAGE_WRAPPERS_SRCSwrappers.cpp)
4619
add_library(cppnetlib-message-wrappers${CPP-NETLIB_MESSAGE_WRAPPERS_SRCS})
47-
foreach (src_file${CPP-NETLIB_MESSAGE_WRAPPERS_SRCS})
48-
if (${CMAKE_CXX_COMPILER_ID}MATCHESGNU)
49-
set_source_files_properties(${src_file}
50-
PROPERTIESCOMPILE_FLAGS${CPP-NETLIB_CXXFLAGS})
51-
elseif (${CMAKE_CXX_COMPILER_ID}MATCHESClang)
52-
set_source_files_properties(${src_file}
53-
PROPERTIESCOMPILE_FLAGS${CPP-NETLIB_CXXFLAGS})
54-
endif()
55-
endforeach(src_file)

‎message/test/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ include_directories(${CPP-NETLIB_SOURCE_DIR}/message/src)
1010
if (CPP-NETLIB_BUILD_TESTS)
1111
set(TESTSmessage_testmessage_transform_test)
1212
foreach (test${TESTS})
13-
if (${CMAKE_CXX_COMPILER_ID}MATCHESGNU)
14-
set_source_files_properties(${test}.cpp
15-
PROPERTIESCOMPILE_FLAGS"-Wall")
16-
endif()
1713
add_executable(cpp-netlib-${test}${test}.cpp)
1814
add_dependencies(cpp-netlib-${test}cppnetlib-messagecppnetlib-message-directivescppnetlib-message-wrappers)
1915
target_link_libraries(cpp-netlib-${test}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp