This is an archive of the discontinued LLVM Phabricator instance.

Differential D30911

[CMake] fix CLANG_INCLUDE_DIRS CMake export
ClosedPublic

Authored by Sarcasm on Mar 13 2017, 2:30 PM.

Details

Reviewers
beanz
Commits
rGd2a64aa85490: [CMake] fix CLANG_INCLUDE_DIRS CMake export
rC298424: [CMake] fix CLANG_INCLUDE_DIRS CMake export
rL298424: [CMake] fix CLANG_INCLUDE_DIRS CMake export
Summary

This change should fixes the export of CLANG_INCLUDE_DIRS variable in ClangConfig.cmake.

Unlike for the other variables, CLANG_INSTALL_PREFIX wasn't escaped meaning CLANG_INCLUDE_DIRS
resulting in the path "/include" instead of "${CLANG_INSTALL_PREFIX}/include".

Diff Detail

Repository
rL LLVM

Event Timeline

Sarcasm created this revision.Mar 13 2017, 2:30 PM
Herald added a subscriber: mgorny. · View Herald TranscriptMar 13 2017, 2:30 PM
beanz accepted this revision.Mar 17 2017, 2:47 PM
beanz added a subscriber: llvm-commits.

LGTM!

This revision is now accepted and ready to land.Mar 17 2017, 2:47 PM
Closed by commit rL298424: [CMake] fix CLANG_INCLUDE_DIRS CMake export (authored by papin_g). · Explain WhyMar 21 2017, 12:30 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
cfe/
trunk/
cmake/
modules/
2 lines

Diff 92525

cfe/trunk/cmake/modules/CMakeLists.txt

Show All 36 Lines
foreach(p ${_count}) foreach(p ${_count})
set(CLANG_CONFIG_CODE "${CLANG_CONFIG_CODE} set(CLANG_CONFIG_CODE "${CLANG_CONFIG_CODE}
get_filename_component(CLANG_INSTALL_PREFIX \"\${CLANG_INSTALL_PREFIX}\" PATH)") get_filename_component(CLANG_INSTALL_PREFIX \"\${CLANG_INSTALL_PREFIX}\" PATH)")
endforeach(p) endforeach(p)
set(CLANG_CONFIG_CMAKE_DIR "\${CLANG_INSTALL_PREFIX}/${CLANG_INSTALL_PACKAGE_DIR}") set(CLANG_CONFIG_CMAKE_DIR "\${CLANG_INSTALL_PREFIX}/${CLANG_INSTALL_PACKAGE_DIR}")
set(CLANG_CONFIG_LLVM_CMAKE_DIR "\${CLANG_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}") set(CLANG_CONFIG_LLVM_CMAKE_DIR "\${CLANG_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}")
set(CLANG_CONFIG_EXPORTS_FILE "\${CLANG_CMAKE_DIR}/ClangTargets.cmake") set(CLANG_CONFIG_EXPORTS_FILE "\${CLANG_CMAKE_DIR}/ClangTargets.cmake")
set(CLANG_CONFIG_INCLUDE_DIRS set(CLANG_CONFIG_INCLUDE_DIRS
"${CLANG_INSTALL_PREFIX}/include" "\${CLANG_INSTALL_PREFIX}/include"
) )
configure_file( configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/ClangConfig.cmake.in ${CMAKE_CURRENT_SOURCE_DIR}/ClangConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/ClangConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/ClangConfig.cmake
@ONLY) @ONLY)
set(CLANG_CONFIG_CODE) set(CLANG_CONFIG_CODE)
set(CLANG_CONFIG_CMAKE_DIR) set(CLANG_CONFIG_CMAKE_DIR)
set(CLANG_CONFIG_EXPORTS_FILE) set(CLANG_CONFIG_EXPORTS_FILE)
Show All 11 Lines