From 04ef5428cda4813f6d61e3454dbd07e5a5c9874f Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Sat, 15 Aug 2009 21:57:01 +0000 Subject: [PATCH] Revert 78996. It was breaking MSVC builds. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79144 91177308-0d34-0410-b5e6-96231b3b80d8 --- CMakeLists.txt | 2 -- cmake/modules/AddLLVM.cmake | 7 ------- 2 files changed, 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 32dcae79f63..068ef963aff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -266,7 +266,6 @@ set(LLVM_ENUM_ASM_PRINTERS "") set(LLVM_ENUM_ASM_PARSERS "") foreach(t ${LLVM_TARGETS_TO_BUILD}) message(STATUS "Targeting ${t}") - set(CURRENT_LLVM_TARGET ${t}) add_subdirectory(lib/Target/${t}) add_subdirectory(lib/Target/${t}/TargetInfo) if( EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Target/${t}/AsmPrinter/CMakeLists.txt ) @@ -279,7 +278,6 @@ foreach(t ${LLVM_TARGETS_TO_BUILD}) set(LLVM_ENUM_ASM_PARSERS "${LLVM_ENUM_ASM_PARSERS}LLVM_ASM_PARSER(${t})\n") endif( EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Target/${t}/AsmParser/CMakeLists.txt ) - set(CURRENT_LLVM_TARGET) endforeach(t) # Produce llvm/Config/AsmPrinters.def diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index 59716032604..0d263f83655 100755 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake @@ -12,13 +12,6 @@ macro(add_llvm_library name) install(TARGETS ${name} LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) - # The LLVM Target library shall be built before its sublibraries - # (asmprinter, etc) because those may use tablegenned files which - # generation is triggered by the main LLVM target library. Necessary - # for parallel builds: - if( CURRENT_LLVM_TARGET ) - add_dependencies(${name} LLVM${CURRENT_LLVM_TARGET}) - endif() endmacro(add_llvm_library name)