Commit5ac69cb

committed

Merge pull request#211 from w0land/master-integration

Master integration

2 parents7f63e41 +7dd218d commit5ac69cbCopy full SHA for 5ac69cb

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,16 +43,16 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)`
`43`	`43`	`INCLUDE(CheckCXXCompilerFlag)`
`44`	`44`	`CHECK_CXX_COMPILER_FLAG(-std=c++11HAVE_STD11)`
`45`	`45`	`if (HAVE_STD11)`
`46`		`-set(CMAKE_CXX_FLAGS-std=c++11-Wall)`
	`46`	`+list(APPENDCMAKE_CXX_FLAGS"-std=c++11 -Wall")`
`47`	`47`	`else()`
`48`	`48`	`message(FATAL_ERROR"No advanced standard C++ support (-std=c++11 not defined).")`
`49`	`49`	`endif()`
`50`	`50`	`elseif(${CMAKE_CXX_COMPILER_ID}MATCHESClang)`
`51`	`51`	`INCLUDE(CheckCXXCompilerFlag)`
`52`	`52`	`CHECK_CXX_COMPILER_FLAG(-std=c++11HAVE_STD11)`
`53`	`53`	`if (HAVE_STD11)`
`54`		`-set(CMAKE_CXX_FLAGS"-std=c++11 -stdlib=libc++ -Wall")`
`55`		`-set(CMAKE_CXX_LINK_FLAGS"-std=c++11 -stdlib=libc++")`
	`54`	`+list(APPENDCMAKE_CXX_FLAGS"-std=c++11 -stdlib=libc++ -Wall")`
	`55`	`+list(APPENDCMAKE_CXX_LINK_FLAGS"-std=c++11 -stdlib=libc++")`
`56`	`56`	`else()`
`57`	`57`	`message(FATAL_ERROR"No C++11 support for Clang version. Please upgrade Clang to a version supporting C++11.")`
`58`	`58`	`endif()`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,8 @@ if (CPP-NETLIB_BUILD_TESTS)`
`83`	`83`	`cppnetlib-http-message`
`84`	`84`	`cppnetlib-http-message-wrappers`
`85`	`85`	`cppnetlib-http-client`
`86`		`-cppnetlib-http-client-connections)`
	`86`	`+cppnetlib-http-client-connections`
	`87`	`+cppnetlib-logging)`
`87`	`88`	`if (OPENSSL_FOUND)`
`88`	`89`	`target_link_libraries(cpp-netlib-http-client_test${OPENSSL_LIBRARIES})`
`89`	`90`	`endif()`

Comments

(0)