r189390 - Revert "CMake: Fix out-of-source build's symlinks."

[Jordan Rose]

Ugh. Thanks, Reid.


On Aug 27, 2013, at 11:27 , Reid Kleckner <reid at kleckner.net> wrote:

> Author: rnk
> Date: Tue Aug 27 13:27:08 2013
> New Revision: 189390
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=189390&view=rev
> Log:
> Revert "CMake: Fix out-of-source build's symlinks."
> 
> This reverts commit r189371, it broke the in-source cmake build.
> 
> Modified:
>    cfe/trunk/tools/driver/CMakeLists.txt
> 
> Modified: cfe/trunk/tools/driver/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/CMakeLists.txt?rev=189390&r1=189389&r2=189390&view=diff
> ==============================================================================
> --- cfe/trunk/tools/driver/CMakeLists.txt (original)
> +++ cfe/trunk/tools/driver/CMakeLists.txt Tue Aug 27 13:27:08 2013
> @@ -65,11 +65,11 @@ if(UNIX)
>   set(clang_binary "clang${CMAKE_EXECUTABLE_SUFFIX}")
> else()
>   set(CLANGXX_LINK_OR_COPY copy)
> -  set(clang_binary "${CLANG_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/clang${CMAKE_EXECUTABLE_SUFFIX}")
> +  set(clang_binary "${LLVM_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/clang${CMAKE_EXECUTABLE_SUFFIX}")
> endif()
> 
> # Create the clang++ symlink in the build directory.
> -set(clang_pp "${CLANG_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/clang++${CMAKE_EXECUTABLE_SUFFIX}")
> +set(clang_pp "${LLVM_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/clang++${CMAKE_EXECUTABLE_SUFFIX}")
> add_custom_command(TARGET clang POST_BUILD
>     COMMAND ${CMAKE_COMMAND} -E ${CLANGXX_LINK_OR_COPY} "${clang_binary}" "${clang_pp}")
> 
> @@ -77,7 +77,7 @@ set_property(DIRECTORY APPEND
>   PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${clang_pp})
> 
> # Create the clang-cl symlink in the build directory.
> -set(clang_cl "${CLANG_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/clang-cl${CMAKE_EXECUTABLE_SUFFIX}")
> +set(clang_cl "${LLVM_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/clang-cl${CMAKE_EXECUTABLE_SUFFIX}")
> add_custom_command(TARGET clang POST_BUILD
>     COMMAND ${CMAKE_COMMAND} -E ${CLANGXX_LINK_OR_COPY} "${clang_binary}" "${clang_cl}")
> 
> 
> 
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits