Skip to content

Commit

Permalink
[CMake] Generate ${BUILD_MODE}/llvm-lit for each ${CMAKE_CONFIGURATIO…
Browse files Browse the repository at this point in the history
…N_TYPES}.

llvm-lit can be invoked;

  $ Release/bin/llvm-lit

instead of;

  $ bin/llvm-lit --param buid_mode=Release

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@198206 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
chapuni committed Dec 30, 2013
1 parent 74ae528 commit e18e76e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
20 changes: 16 additions & 4 deletions utils/llvm-lit/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,20 @@ if (WIN32 AND NOT CYGWIN)
# llvm-lit needs suffix.py for multiprocess to find a main module.
set(suffix .py)
endif ()
set(llvm_lit_path ${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-lit${suffix})

configure_file(
llvm-lit.in
${LLVM_TOOLS_BINARY_DIR}/llvm-lit${suffix}
)
if(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
foreach(BUILD_MODE ${CMAKE_CONFIGURATION_TYPES})
string(REPLACE ${CMAKE_CFG_INTDIR} ${BUILD_MODE} bi ${llvm_lit_path})
configure_file(
llvm-lit.in
${bi}
)
endforeach()
else()
set(BUILD_MODE .)
configure_file(
llvm-lit.in
${llvm_lit_path}
)
endif()
2 changes: 1 addition & 1 deletion utils/llvm-lit/llvm-lit.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ sys.path.insert(0, os.path.join(llvm_source_root, 'utils', 'lit'))
# Set up some builtin parameters, so that by default the LLVM test suite
# configuration file knows how to find the object tree.
builtin_parameters = {
'build_mode' : "@CMAKE_CFG_INTDIR@",
'build_mode' : "@BUILD_MODE@",
'llvm_site_config' : os.path.join(llvm_obj_root, 'test', 'lit.site.cfg'),
'llvm_unit_site_config' : os.path.join(llvm_obj_root, 'test', 'Unit',
'lit.site.cfg')
Expand Down

0 comments on commit e18e76e

Please sign in to comment.