r189426 - Revert "Use CMAKE_RUNTIME_OUTPUT_DIRECTORY instead of LLVM_BINARY_DIR for installing Clang headers."

Ted Kremenek kremenek at apple.com
Tue Aug 27 17:07:08 PDT 2013


Author: kremenek
Date: Tue Aug 27 19:07:08 2013
New Revision: 189426

URL: http://llvm.org/viewvc/llvm-project?rev=189426&view=rev
Log:
Revert "Use CMAKE_RUNTIME_OUTPUT_DIRECTORY instead of LLVM_BINARY_DIR for installing Clang headers."

This appears to be breaking the buildbots.

Modified:
    cfe/trunk/lib/Headers/CMakeLists.txt

Modified: cfe/trunk/lib/Headers/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/CMakeLists.txt?rev=189426&r1=189425&r2=189426&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/CMakeLists.txt (original)
+++ cfe/trunk/lib/Headers/CMakeLists.txt Tue Aug 27 19:07:08 2013
@@ -44,13 +44,13 @@ set(files
   module.map
   )
 
-set(output_dir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib/clang/${CLANG_VERSION}/include)
+set(output_dir ${LLVM_BINARY_DIR}/lib/clang/${CLANG_VERSION}/include)
 
 # If we are in an IDE that has a configuration directory, we need to
 # create a second copy of the headers so that 'clang' can find them if
 # it's run from the build directory.
 if(MSVC_IDE OR XCODE)
-   set(other_output_dir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/bin/lib/clang/${CLANG_VERSION}/include)
+   set(other_output_dir ${LLVM_BINARY_DIR}/bin/lib/clang/${CLANG_VERSION}/include)
 endif()
 
 # Generate arm_neon.h
@@ -98,8 +98,8 @@ set_target_properties(clang-headers PROP
 if (other_output_dir)
 	if(UNIX)
 		add_custom_command(TARGET clang-headers POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib/${CMAKE_CFG_INTDIR}"
-	    	COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/bin/lib/clang" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib/${CMAKE_CFG_INTDIR}/clang")
+            COMMAND ${CMAKE_COMMAND} -E make_directory "${LLVM_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}"
+	    	COMMAND ${CMAKE_COMMAND} -E create_symlink "${LLVM_BINARY_DIR}/bin/lib/clang" "${LLVM_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}/clang")
 	endif()
 endif ()
 





More information about the cfe-commits mailing list