Remove warnings about old CMake options

llvm-svn: 239667

diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index 5c4c19fe111946bd6b78200bed7044914212b6b4..4289c2a144fcd18c8791a92d37b5647170f05352 100644 (file)
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/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
 #===============================================================================