aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2009-08-27 03:29:26 +0000
committerBill Wendling <isanbard@gmail.com>2009-08-27 03:29:26 +0000
commitfffb7266fe9c5c95d859ff5b3aeb5386cbd0cd1e (patch)
tree5c7de87c7bbfb1494ede3e77863a253d43c4cec5 /cmake
parent27920594b940d824038d16b13846aa76cac493cf (diff)
--- Reverse-merging r80147 into '.':
A include/llvm/ADT/iterator.cmake U autoconf/configure.ac --- Reverse-merging r80161 into '.': U cmake/config-ix.cmake --- Reverse-merging r80171 into '.': U Makefile --- Reverse-merging r80173 into '.': U configure U include/llvm/Config/config.h.in --- Reverse-merging r80180 into '.': A include/llvm/ADT/iterator.h.in Despite common miscomceptions, iterator.h is alive and well. It broke the build bots for several hours. And yet no one bothered to look at them. Gabor and Doug, please review your changes and make sure that they actually build before resubmitting them. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80197 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
-rwxr-xr-xcmake/config-ix.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 85f9470874..52025a9ee2 100755
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -181,6 +181,11 @@ configure_file(
)
configure_file(
+ ${LLVM_MAIN_INCLUDE_DIR}/llvm/ADT/iterator.cmake
+ ${LLVM_BINARY_DIR}/include/llvm/ADT/iterator.h
+ )
+
+configure_file(
${LLVM_MAIN_INCLUDE_DIR}/llvm/Support/DataTypes.h.cmake
${LLVM_BINARY_DIR}/include/llvm/Support/DataTypes.h
)