This is an archive of the discontinued LLVM Phabricator instance.

Differential D41804

[cmake] Fix typo in LLVM_UTILS_INSTALL_DIR definition.
ClosedPublic

Authored by hintonda on Jan 6 2018, 1:02 PM.

Details

Reviewers
tstellar
beanz
bogner
Commits
rG435d650ef439: [cmake] Fix typo in LLVM_UTILS_INSTALL_DIR definition.
rL322959: [cmake] Fix typo in LLVM_UTILS_INSTALL_DIR definition.
Summary

Fix typo in LLVM_UTILS_INSTALL_DIR definition, and set
default correctly.

Diff Detail

Event Timeline

hintonda created this revision.Jan 6 2018, 1:02 PM
Herald added a subscriber: mgorny. · View Herald TranscriptJan 6 2018, 1:02 PM
hintonda added a comment.Jan 18 2018, 1:20 PM

ping...

bogner accepted this revision.Jan 18 2018, 1:52 PM
bogner added a subscriber: bogner.

This is obvious enough that it didn't really need pre-commit review. Please commit.

This revision is now accepted and ready to land.Jan 18 2018, 1:52 PM
hintonda added a comment.Jan 18 2018, 2:09 PM

Thanks and I'll keep that in mind...

Closed by commit rL322959: [cmake] Fix typo in LLVM_UTILS_INSTALL_DIR definition. (authored by dhinton). · Explain WhyJan 19 2018, 9:04 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
4 lines

Diff 128857

CMakeLists.txt

Show First 20 Lines • Show All 270 Lines • ▼ Show 20 Linesif (CMAKE_BUILD_TYPE AND
message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
endif() endif()
set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) mark_as_advanced(LLVM_TOOLS_INSTALL_DIR)
set(LLVM_UTILS_INSTALL_DIR "bin" CACHE STRING set(LLVM_UTILS_INSTALL_DIR "${LLVM_TOOLS_INSTALL_DIR}" CACHE STRING
"Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)") "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)")
mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) mark_as_advanced(LLVM_UTILS_INSTALL_DIR)
# They are used as destination of target generators. # They are used as destination of target generators.
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
if(WIN32 OR CYGWIN) if(WIN32 OR CYGWIN)
# DLL platform -- put DLLs into bin. # DLL platform -- put DLLs into bin.
set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
else() else()
▲ Show 20 Lines • Show All 731 Lines • Show Last 20 Lines