X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=CMakeLists.txt;h=6ef79b91deb6e2f1c37030ce03d5ff68a6a6b70d;hb=28088d3c049017a131aa7b07201c6e19c0227cef;hp=4c4239b045afb24dc19f873595f291753f83bea8;hpb=cccecb8ea2a314f22d9081e339e74a1779ef684c;p=oota-llvm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c4239b045a..6ef79b91deb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,10 @@ set(LLVM_ALL_TARGETS
   XCore
   )
 
+# List of targets whose asmprinters need to be forced to link
+# into executables on some platforms (i.e. Windows):
+set(LLVM_ASMPRINTERS_FORCE_LINK X86 PowerPC)
+
 if( MSVC )
   set(LLVM_TARGETS_TO_BUILD X86
     CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
@@ -95,8 +99,6 @@ endif(WIN32)
 if( EXISTS ${LLVM_TOOLS_BINARY_DIR}/llvm-config )
   set(HAVE_LLVM_CONFIG 1)
 endif( EXISTS ${LLVM_TOOLS_BINARY_DIR}/llvm-config )
-# find_file(HAVE_LLVM_CONFIG llvm-config ${LLVM_TOOLS_BINARY_DIR})
-# message(STATUS ${HAVE_LLVM_CONFIG})
 
 include(config-ix)
 
@@ -133,9 +135,6 @@ if( MSVC )
 endif( MSVC )
 
 include_directories( ${LLVM_BINARY_DIR}/include ${LLVM_MAIN_INCLUDE_DIR})
-#link_directories( d:/dev/lib )
-
-#add_subdirectory(lib)
 
 include(AddLLVM)
 include(AddPartiallyLinkedObject)
@@ -157,15 +156,7 @@ if( CMAKE_CROSSCOMPILING )
   include( CrossCompileLLVM )
 endif( CMAKE_CROSSCOMPILING )
 
-add_custom_command(OUTPUT ${llvm_builded_incs_dir}/Intrinsics.gen
-  COMMAND ${LLVM_TABLEGEN} -gen-intrinsic -I ${LLVM_MAIN_INCLUDE_DIR} ${LLVM_MAIN_INCLUDE_DIR}/llvm/Intrinsics.td -o ${llvm_builded_incs_dir}/Intrinsics.gen
-  DEPENDS tblgen
-  COMMENT "Building intrinsics.gen...")
-
-add_custom_target(intrinsics_gen ALL
-  DEPENDS ${llvm_builded_incs_dir}/Intrinsics.gen)
-
-set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} intrinsics_gen )
+add_subdirectory(include/llvm)
 
 add_subdirectory(lib/VMCore)
 add_subdirectory(lib/CodeGen)