diff options
| author | Eric Fiselier <eric@efcs.ca> | 2015-06-13 07:31:55 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2015-06-13 07:31:55 +0000 |
| commit | 6f0811110212dd0e0c8caafb781406876fdb5add (patch) | |
| tree | d4e9578d09cf13bdcf828663d0540106bdd78854 | |
| parent | fdae69aa130f50e6992c7e49cc957f008dd86540 (diff) | |
| download | external_libcxx-6f0811110212dd0e0c8caafb781406876fdb5add.tar.gz external_libcxx-6f0811110212dd0e0c8caafb781406876fdb5add.tar.bz2 external_libcxx-6f0811110212dd0e0c8caafb781406876fdb5add.zip | |
Remove warnings about old CMake options
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@239667 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | CMakeLists.txt | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c4c19fe1..4289c2a14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,27 +104,6 @@ set_property(CACHE LIBCXX_CXX_ABI PROPERTY STRINGS ;${CXXABIS}) # link with libunwind or libgcc_s while running the test cases. option(LIBCXXABI_USE_LLVM_UNWINDER "Build and use the LLVM unwinder." OFF) -# TODO(ericwf): Remove these options by March/25/2015. -# These CMake options have been removed in favor of a generic option -# "LIBCXX_CXX_ABI_INCLUDE_PATHS". Issue an explicit error message explaining -# the change for anybody that still uses them. -if (DEFINED LIBCXX_LIBCXXABI_INCLUDE_PATHS) - message(FATAL_ERROR - "The option \"LIBCXX_LIBCXXABI_INCLUDE_PATHS\" has been removed. " - "Use \"LIBCXX_CXX_ABI_INCLUDE_PATHS\" instead " - "and clean your build directory.") -elseif(DEFINED LIBCXX_LIBSUPCXX_INCLUDE_PATHS) - message(FATAL_ERROR - "The option \"LIBCXX_LIBSUPCXX_INCLUDE_PATHS\" has been removed. " - "Use \"LIBCXX_CXX_ABI_INCLUDE_PATHS\" instead " - "and clean your build directory.") -elseif(DEFINED LIBCXX_LIBCXXRT_INCLUDE_PATHS) - message(FATAL_ERROR - "The option \"LIBCXX_LIBCXXRT_INCLUDE_PATHS\" has been removed. " - "Use \"LIBCXX_CXX_ABI_INCLUDE_PATHS\" instead " - "and clean your build directory.") -endif() - #=============================================================================== # Configure System #=============================================================================== |