Skip to content

Commit

Permalink
ccmlib/common: check for scylla built with CMake as well
Browse files Browse the repository at this point in the history
cmake generates scylla at paths like `build/Debug/scylla` instead of
`build/debug/scylla`, so check for them as well.

Signed-off-by: Kefu Chai <[email protected]>
  • Loading branch information
tchaikov authored and fruch committed Jan 17, 2024
1 parent 3241e5f commit 50cfb26
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion ccmlib/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,8 @@ def isScylla(install_dir):
return True

scylla_build_modes = ['debug', 'dev', 'release']
for mode in scylla_build_modes:
cmake_build_types = ['Debug', 'Dev', 'RelWithDebInfo']
for mode in scylla_build_modes + cmake_build_types:
if os.path.exists(os.path.join(install_dir, 'build', mode, 'scylla')):
return True

Expand Down

0 comments on commit 50cfb26

Please sign in to comment.