diff options
author | Alexey Samsonov <samsonov@google.com> | 2014-02-18 14:28:53 +0000 |
---|---|---|
committer | Alexey Samsonov <samsonov@google.com> | 2014-02-18 14:28:53 +0000 |
commit | a52e2dc237ebe66e0ee014cf44ed8e562ceb3f88 (patch) | |
tree | c63a84628a983d0f43af8098886256d70841856b /include | |
parent | 47fe1ee3d6bb8b6f3dd789895028ec4c308872c6 (diff) |
[CMake] Rename several variables
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@201575 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
-rw-r--r-- | include/CMakeLists.txt | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 5cb0f2f98..b5d98a805 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -7,11 +7,7 @@ set(SANITIZER_HEADERS sanitizer/msan_interface.h sanitizer/tsan_interface_atomic.h) -set(output_dir ${LLVM_BINARY_DIR}/lib/clang/${CLANG_VERSION}/include) - -if(MSVC_IDE OR XCODE) - set(other_output_dir ${LLVM_BINARY_DIR}/bin/lib/clang/${CLANG_VERSION}/include) -endif() +set(output_dir ${COMPILER_RT_OUTPUT_DIR}/include) # Copy compiler-rt headers to the build tree. set(out_files) @@ -23,15 +19,6 @@ foreach( f ${SANITIZER_HEADERS} ) COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src} ${dst} COMMENT "Copying compiler-rt's ${f}...") list(APPEND out_files ${dst}) - - if(other_output_dir) - set(other_dst ${other_output_dir}/${f}) - add_custom_command(OUTPUT ${other_dst} - DEPENDS ${src} - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src} ${other_dst} - COMMENT "Copying compiler-rt's ${f}...") - list(APPEND out_files ${other_dst}) - endif() endforeach( f ) add_custom_target(compiler-rt-headers ALL DEPENDS ${out_files}) @@ -40,4 +27,4 @@ add_dependencies(compiler-rt compiler-rt-headers) # Install sanitizer headers. install(FILES ${SANITIZER_HEADERS} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - DESTINATION ${LIBCLANG_INSTALL_PATH}/include/sanitizer) + DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer) |