X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=CMakeLists.txt;h=31b1f3063bb06bddf439b99bd4791b83f8db737f;hb=93990d775ea4ac13c9c2614e84fc19a7a2161771;hp=6abfa4f215e5a766c6d7f7740f543dd1d33d2680;hpb=af10910cc5655ecf8e897f329bdeb0b393f7eb48;p=oota-llvm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6abfa4f215e..31b1f3063bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,24 @@ set(LLVM_TOOLS_BINARY_DIR ${LLVM_BINARY_DIR}/bin)
 set(LLVM_EXAMPLES_BINARY_DIR ${LLVM_BINARY_DIR}/examples)
 set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
 
+if( NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR )
+  file(GLOB_RECURSE
+    tablegenned_files_on_include_dir
+    "${LLVM_MAIN_SRC_DIR}/include/llvm/*.gen")
+  file(GLOB_RECURSE
+    tablegenned_files_on_lib_dir
+    "${LLVM_MAIN_SRC_DIR}/lib/Target/*.inc")
+  if( tablegenned_files_on_include_dir OR tablegenned_files_on_lib_dir)
+    message(FATAL_ERROR "Apparently there is a previous in-source build,
+probably as the result of running `configure' and `make' on
+${LLVM_MAIN_SRC_DIR}.
+This may cause problems. The suspicious files are:
+${tablegenned_files_on_lib_dir}
+${tablegenned_files_on_include_dir}
+Please clean the source directory.")
+  endif()
+endif()
+
 set(LLVM_ALL_TARGETS
   Alpha
   ARM
@@ -37,6 +55,7 @@ set(LLVM_ALL_TARGETS
   IA64
   Mips
   MSIL
+  MSP430
   PIC16
   PowerPC
   Sparc
@@ -66,7 +85,7 @@ endif()
 
 if( LLVM_ENABLE_ASSERTIONS )
   # MSVC doesn't like _DEBUG on release builds. See PR 4379.
-  if( NOT MSVC OR NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE" )
+  if( NOT MSVC )
     add_definitions( -D_DEBUG )
   endif()
   # On Release builds cmake automatically defines NDEBUG, so we