mirror of
https://github.com/triqs/dft_tools
synced 2024-10-31 19:23:45 +01:00
[cmake] Minor modif. C++14 in definition for apps.
- Change the message for cmake of apps (was misleading C++11 while 14). - minor cleaning
This commit is contained in:
parent
3893c41fc0
commit
5eaab18b4f
@ -81,9 +81,10 @@ endif(compiler_version VERSION_LESS ${compiler_version_min} )
|
|||||||
# on OS X : for clang, add the infamous -stdlib=libc++
|
# on OS X : for clang, add the infamous -stdlib=libc++
|
||||||
IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||||
if (CMAKE_COMPILER_IS_CLANG)
|
if (CMAKE_COMPILER_IS_CLANG)
|
||||||
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ ")
|
#set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ ")
|
||||||
|
set(TRIQS_CXX_DEFINITIONS ${TRIQS_CXX_DEFINITIONS} " -stdlib=libc++ -Wno-deprecated-writable-strings ")
|
||||||
MESSAGE(STATUS "Adding compilation flags -stdlib=libc++ ")
|
MESSAGE(STATUS "Adding compilation flags -stdlib=libc++ ")
|
||||||
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-writable-strings ")
|
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ ")
|
||||||
else (CMAKE_COMPILER_IS_CLANG)
|
else (CMAKE_COMPILER_IS_CLANG)
|
||||||
MESSAGE( WARNING "${line_of_star}You are on Os X but your are not using clang. This is NOT recommended...${line_of_star}")
|
MESSAGE( WARNING "${line_of_star}You are on Os X but your are not using clang. This is NOT recommended...${line_of_star}")
|
||||||
endif (CMAKE_COMPILER_IS_CLANG)
|
endif (CMAKE_COMPILER_IS_CLANG)
|
||||||
|
@ -58,8 +58,11 @@ endmacro(triqs_get_git_hash)
|
|||||||
# Python specific stuff
|
# Python specific stuff
|
||||||
set (TRIQS_PYTHON_INTERPRETER @PYTHON_INTERPRETER@)
|
set (TRIQS_PYTHON_INTERPRETER @PYTHON_INTERPRETER@)
|
||||||
|
|
||||||
message(STATUS "TRIQS : Adding C++11 compilation flags -std=c++11 ")
|
message(STATUS "TRIQS : Adding compilation flags detected by the library (C++11/14, libc++, etc...) ")
|
||||||
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x ")
|
add_definitions(${TRIQS_CXX_DEFINITIONS})
|
||||||
|
#set( CMAKE_CXX_FLAGS "${TRIQS_CXX_DEFINITIONS} ${CMAKE_CXX_FLAGS} ")
|
||||||
|
#message(STATUS "TRIQS : Adding C++11 compilation flags -std=c++11 ")
|
||||||
|
#set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x ")
|
||||||
#add_definitions( -std=c++0x)
|
#add_definitions( -std=c++0x)
|
||||||
|
|
||||||
# Check compiler
|
# Check compiler
|
||||||
@ -70,7 +73,7 @@ endif()
|
|||||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||||
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
|
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
|
||||||
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ ")
|
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ ")
|
||||||
message(STATUS "TRIQS : Adding C++11 compilation flags for Os X: -stdlib=libc++ ")
|
message(STATUS "TRIQS : Adding C++11/14 compilation flags for Os X: -stdlib=libc++ ")
|
||||||
else ()
|
else ()
|
||||||
message( WARNING "${line_of_star}You are on Os X but your are not using clang. This is NOT recommended...${line_of_star}")
|
message( WARNING "${line_of_star}You are on Os X but your are not using clang. This is NOT recommended...${line_of_star}")
|
||||||
endif ()
|
endif ()
|
||||||
|
Loading…
Reference in New Issue
Block a user