This is an archive of the discontinued LLVM Phabricator instance.

Differential D10994

cmake no longer needs to deal with -std=c++11 checks. LLVM requires and handles this now and has the correct compiler version checks. This block of code for cmake in LLDB is no longer needed.
ClosedPublic

Authored by brucem on Jul 7 2015, 7:34 AM.

Details

Reviewers
labath
Commits
rG1f44139a4fde: cmake no longer needs to deal with -std=c++11 checks.
rLLDB241590: cmake no longer needs to deal with -std=c++11 checks.
rL241590: cmake no longer needs to deal with -std=c++11 checks.
Summary

cmake no longer needs to deal with -std=c++11 checks.

Diff Detail

Repository
rL LLVM

Event Timeline

brucem updated this revision to Diff 29174.Jul 7 2015, 7:34 AM
brucem retitled this revision from to cmake no longer needs to deal with -std=c++11 checks. LLVM requires and handles this now and has the correct compiler version checks. This block of code for cmake in LLDB is no longer needed..
brucem updated this object.
brucem added a reviewer: labath.
brucem added a subscriber: lldb-commits.
labath accepted this revision.Jul 7 2015, 7:44 AM
labath edited edge metadata.

lgtm

Please fix the commit title when you commit this.

This revision is now accepted and ready to land.Jul 7 2015, 7:44 AM
Closed by commit rL241590: cmake no longer needs to deal with -std=c++11 checks. (authored by brucem). · Explain WhyJul 7 2015, 7:53 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lldb/
trunk/
cmake/
modules/
26 lines

Diff 29177

lldb/trunk/cmake/modules/LLDBConfig.cmake

Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Linesif (LLDB_DISABLE_PYTHON)
unset(PYTHON_INCLUDE_DIR) unset(PYTHON_INCLUDE_DIR)
unset(PYTHON_LIBRARY) unset(PYTHON_LIBRARY)
add_definitions( -DLLDB_DISABLE_PYTHON ) add_definitions( -DLLDB_DISABLE_PYTHON )
endif() endif()
include_directories(../clang/include) include_directories(../clang/include)
include_directories("${CMAKE_CURRENT_BINARY_DIR}/../clang/include") include_directories("${CMAKE_CURRENT_BINARY_DIR}/../clang/include")
# lldb requires c++11 to build. Make sure that we have a compiler and standard
# library combination that can do that.
if (NOT MSVC)
# gcc and clang require the -std=c++0x or -std=c++11 flag.
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR
"${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
if (NOT ("${CMAKE_CXX_FLAGS}" MATCHES "-std=c\\+\\+0x" OR
"${CMAKE_CXX_FLAGS}" MATCHES "-std=gnu\\+\\+0x" OR
"${CMAKE_CXX_FLAGS}" MATCHES "-std=c\\+\\+11" OR
"${CMAKE_CXX_FLAGS}" MATCHES "-std=gnu\\+\\+11"))
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif()
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif()
endif()
endif()
elseif (MSVC_VERSION LESS 1700)
message(FATAL_ERROR "The selected compiler does not support c++11 which is "
"required to build lldb.")
endif()
# Disable GCC warnings # Disable GCC warnings
check_cxx_compiler_flag("-Wno-deprecated-declarations" check_cxx_compiler_flag("-Wno-deprecated-declarations"
CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS) CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS)
if (CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS) if (CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
endif () endif ()
check_cxx_compiler_flag("-Wno-unknown-pragmas" check_cxx_compiler_flag("-Wno-unknown-pragmas"
▲ Show 20 Lines • Show All 152 Lines • Show Last 20 Lines