OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Use CMAKE_RUNTIME_OUTPUT_DIRECTORY instead of LLVM_BINARY_DIR for installing Clang headers. 

llvm-svn: 189414
This commit is contained in:
Ted Kremenek 2013-08-27 23:20:26 +00:00
parent a372a9b503
commit ae2c8776d0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/Headers/CMakeLists.txt
View File

@ -44,13 +44,13 @@ set(files
module.map module.map
) )
set(output_dir ${LLVM_BINARY_DIR}/lib/clang/${CLANG_VERSION}/include) set(output_dir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib/clang/${CLANG_VERSION}/include)
# If we are in an IDE that has a configuration directory, we need to # 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 # create a second copy of the headers so that 'clang' can find them if
# it's run from the build directory. # it's run from the build directory.
if(MSVC_IDE OR XCODE) if(MSVC_IDE OR XCODE)
set(other_output_dir ${LLVM_BINARY_DIR}/bin/lib/clang/${CLANG_VERSION}/include) set(other_output_dir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/bin/lib/clang/${CLANG_VERSION}/include)
endif() endif()
# Generate arm_neon.h # Generate arm_neon.h
@ -98,8 +98,8 @@ set_target_properties(clang-headers PROPERTIES FOLDER "Misc")
if (other_output_dir) if (other_output_dir)
if(UNIX) if(UNIX)
add_custom_command(TARGET clang-headers POST_BUILD add_custom_command(TARGET clang-headers POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory "${LLVM_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}" COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib/${CMAKE_CFG_INTDIR}"
COMMAND ${CMAKE_COMMAND} -E create_symlink "${LLVM_BINARY_DIR}/bin/lib/clang" "${LLVM_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}/clang") COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/bin/lib/clang" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib/${CMAKE_CFG_INTDIR}/clang")
endif() endif()
endif () endif ()