summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOscar Fuentes <ofv@wanadoo.es>2008-11-14 22:21:02 +0000
committerOscar Fuentes <ofv@wanadoo.es>2008-11-14 22:21:02 +0000
commit070114fd793ee3c42868d1cbd56944b76fa16b26 (patch)
tree49c8853309ce17a0b4fcd8621b8ddea84dde0e23
parent751ea9d957ca6e5a12f7a4233227142247669c5f (diff)
downloadbcm5719-llvm-070114fd793ee3c42868d1cbd56944b76fa16b26.tar.gz
bcm5719-llvm-070114fd793ee3c42868d1cbd56944b76fa16b26.zip
CMake: Use LLVM_MAIN_SRC_DIR instead of CMAKE_SOURCE_DIR, for
consistency. Patch by Kevin Andre! llvm-svn: 59326
-rw-r--r--llvm/CMakeLists.txt4
-rw-r--r--llvm/cmake/modules/TableGen.cmake2
2 files changed, 3 insertions, 3 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index f3c89f1938f..4c4239b045a 100644
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -185,9 +185,9 @@ add_subdirectory(lib/Analysis/IPA)
foreach(t ${LLVM_TARGETS_TO_BUILD})
message(STATUS "Targeting ${t}")
add_subdirectory(lib/Target/${t})
- if( EXISTS ${CMAKE_SOURCE_DIR}/lib/Target/${t}/AsmPrinter/CMakeLists.txt )
+ if( EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Target/${t}/AsmPrinter/CMakeLists.txt )
add_subdirectory(lib/Target/${t}/AsmPrinter)
- endif( EXISTS ${CMAKE_SOURCE_DIR}/lib/Target/${t}/AsmPrinter/CMakeLists.txt )
+ endif( EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Target/${t}/AsmPrinter/CMakeLists.txt )
endforeach(t)
add_subdirectory(lib/ExecutionEngine)
diff --git a/llvm/cmake/modules/TableGen.cmake b/llvm/cmake/modules/TableGen.cmake
index aed65589c23..7836c4e4928 100644
--- a/llvm/cmake/modules/TableGen.cmake
+++ b/llvm/cmake/modules/TableGen.cmake
@@ -5,7 +5,7 @@
macro(tablegen ofn)
file(GLOB all_tds "*.td")
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}
- COMMAND ${LLVM_TABLEGEN} ${ARGN} -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${CMAKE_SOURCE_DIR}/lib/Target -I ${LLVM_MAIN_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${LLVM_TARGET_DEFINITIONS} -o ${ofn}
+ COMMAND ${LLVM_TABLEGEN} ${ARGN} -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${LLVM_MAIN_SRC_DIR}/lib/Target -I ${LLVM_MAIN_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${LLVM_TARGET_DEFINITIONS} -o ${ofn}
DEPENDS tblgen ${all_tds}
COMMENT "Building ${ofn}..."
)
OpenPOWER on IntegriCloud