Commit1b50308

committed

CMakeLists changes to properly deal with CMAKE_CXX_FLAGS etc.

1 parent5cb8676 commit1b50308Copy full SHA for 1b50308

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)`
`49`	`49`	`INCLUDE(CheckCXXCompilerFlag)`
`50`	`50`	`CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)`
`51`	`51`	`if (HAVE_STD11)`
`52`		`-list(APPENDCMAKE_CXX_FLAGS"-std=c++11 -Wall")`
	`52`	`+set(CMAKE_CXX_FLAGS${CMAKE_CXX_FLAGS}"-std=c++11 -Wall")`
`53`	`53`	`else()`
`54`	`54`	`message(FATAL_ERROR"No advanced standard C++ support (-std=c++11 not defined).")`
`55`	`55`	`endif()`
`@@ -58,10 +58,10 @@ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)`
`58`	`58`	`CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)`
`59`	`59`	`if (HAVE_STD11)`
`60`	`60`	`if (CPP-NETLIB_DISABLE_LIBCXX)`
`61`		`- list(APPENDCMAKE_CXX_FLAGS"-std=c++11 -Wall")`
`62`		`- list(APPEND CMAKE_CXX_LINK_FLAGS"-std=c++11")`
	`61`	`+ set(CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} -std=c++11 -Wall")`
`63`	`62`	`else()`
`64`		`- list(APPENDCMAKE_CXX_FLAGS"-std=c++11 -stdlib=libc++ -Wall")`
	`63`	`+ set(CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -Wall")`
	`64`	`+ set(CMAKE_CXX_LINK_FLAGS"${CMAKE_CXX_LINK_FLAGS} -stdlib=libc++")`
`65`	`65`	`endif()`
`66`	`66`	`else()`
`67`	`67`	`message(FATAL_ERROR"No C++11 support for Clang version. Please upgrade Clang to a version supporting C++11.")`

Comments

(0)