[llvm-branch-commits] [llvm-branch] r213766 - Merging r213674:

[Dan Liew]

Author: delcypher
Date: Wed Jul 23 10:21:22 2014
New Revision: 213766

URL: http://llvm.org/viewvc/llvm-project?rev=213766&view=rev
Log:
Merging r213674:
------------------------------------------------------------------------
r213674 | delcypher | 2014-07-22 18:48:51 +0100 (Tue, 22 Jul 2014) | 5 lines

Add LLVM_TOOLS_BINARY_DIR variable to LLVMConfig.cmake so clients
of LLVM using CMake can easily find the tools directory.

LLVM_BUILD_TOOLS_BINARY_DIR was removed because it is now
superfluous.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_35/cmake/modules/CMakeLists.txt
    llvm/branches/release_35/cmake/modules/LLVMConfig.cmake.in
    llvm/branches/release_35/cmake/modules/Makefile

Modified: llvm/branches/release_35/cmake/modules/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/cmake/modules/CMakeLists.txt?rev=213766&r1=213765&r2=213766&view=diff
==============================================================================
--- llvm/branches/release_35/cmake/modules/CMakeLists.txt (original)
+++ llvm/branches/release_35/cmake/modules/CMakeLists.txt Wed Jul 23 10:21:22 2014
@@ -20,7 +20,6 @@ set(LLVM_BUILD_BINARY_DIR \"${LLVM_BINAR
 set(LLVM_BUILD_LIBRARY_DIR \"${LLVM_LIBRARY_DIR}\")
 set(LLVM_BUILD_MAIN_INCLUDE_DIR \"${LLVM_MAIN_INCLUDE_DIR}\")
 set(LLVM_BUILD_MAIN_SRC_DIR \"${LLVM_MAIN_SRC_DIR}\")
-set(LLVM_BUILD_TOOLS_BINARY_DIR \"${LLVM_TOOLS_BINARY_DIR}\")
 ")
 set(LLVM_CONFIG_INCLUDE_DIRS
   "${LLVM_MAIN_INCLUDE_DIR}"
@@ -30,6 +29,7 @@ set(LLVM_CONFIG_LIBRARY_DIRS
   "${LLVM_LIBRARY_DIR}"
   )
 set(LLVM_CONFIG_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+set(LLVM_CONFIG_TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR}")
 set(LLVM_CONFIG_EXPORTS_FILE "${llvm_cmake_builddir}/LLVMExports.cmake")
 configure_file(
   LLVMConfig.cmake.in
@@ -60,6 +60,7 @@ endforeach(p)
 set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include")
 set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib")
 set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}")
+set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin")
 set(LLVM_CONFIG_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMExports.cmake")
 configure_file(
   LLVMConfig.cmake.in

Modified: llvm/branches/release_35/cmake/modules/LLVMConfig.cmake.in
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/cmake/modules/LLVMConfig.cmake.in?rev=213766&r1=213765&r2=213766&view=diff
==============================================================================
--- llvm/branches/release_35/cmake/modules/LLVMConfig.cmake.in (original)
+++ llvm/branches/release_35/cmake/modules/LLVMConfig.cmake.in Wed Jul 23 10:21:22 2014
@@ -44,6 +44,7 @@ set(LLVM_INCLUDE_DIRS "@LLVM_CONFIG_INCL
 set(LLVM_LIBRARY_DIRS "@LLVM_CONFIG_LIBRARY_DIRS@")
 set(LLVM_DEFINITIONS "-D__STDC_LIMIT_MACROS" "-D__STDC_CONSTANT_MACROS")
 set(LLVM_CMAKE_DIR "@LLVM_CONFIG_CMAKE_DIR@")
+set(LLVM_TOOLS_BINARY_DIR "@LLVM_CONFIG_TOOLS_BINARY_DIR@")
 
 if(NOT TARGET LLVMSupport)
   include("@LLVM_CONFIG_EXPORTS_FILE@")

Modified: llvm/branches/release_35/cmake/modules/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/cmake/modules/Makefile?rev=213766&r1=213765&r2=213766&view=diff
==============================================================================
--- llvm/branches/release_35/cmake/modules/Makefile (original)
+++ llvm/branches/release_35/cmake/modules/Makefile Wed Jul 23 10:21:22 2014
@@ -63,6 +63,7 @@ $(PROJ_OBJ_DIR)/LLVMConfig.cmake: LLVMCo
 	  -e 's/@LLVM_CONFIG_INCLUDE_DIRS@/'"$(subst /,\/,$(PROJ_includedir))"'/' \
 	  -e 's/@LLVM_CONFIG_LIBRARY_DIRS@/'"$(subst /,\/,$(PROJ_libdir))"'/' \
 	  -e 's/@LLVM_CONFIG_CMAKE_DIR@/'"$(subst /,\/,$(PROJ_cmake))"'/' \
+	  -e 's/@LLVM_CONFIG_TOOLS_BINARY_DIR@/'"$(subst /,\/,$(PROJ_bindir))"'/' \
 	  -e 's/@LLVM_CONFIG_EXPORTS_FILE@/$${LLVM_CMAKE_DIR}\/LLVMExports.cmake/' \
 	  -e 's/@all_llvm_lib_deps@//' \
 	 && \