Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "[v24.1.x] cmake: tweaks for vtools trunk-based development" #22870

Merged
merged 1 commit into from
Aug 14, 2024
Merged

Revert "[v24.1.x] cmake: tweaks for vtools trunk-based development" #22870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Redirect control for internal Redpanda builds
if(REDPANDA_CMAKE_DIR)
if(VECTORIZED_CMAKE_DIR)
cmake_minimum_required(VERSION 3.22)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
include(${REDPANDA_CMAKE_DIR}/main.cmake)
include(${VECTORIZED_CMAKE_DIR}/main.cmake)
return()
endif()

Expand Down
4 changes: 2 additions & 2 deletions tools/cmake_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,11 @@ def _find_addr2lines(self):
return ci_location

# Workstation: find our build directory by searching back from binary
vbuild = find_vbuild_path_from_binary(self.binary, 5)
vbuild = find_vbuild_path_from_binary(self.binary, 3)
if vbuild:
location = os.path.join(
vbuild,
"deps_build/seastar-prefix/src/seastar/scripts/seastar-addr2line"
"v_deps_build/seastar-prefix/src/seastar/scripts/seastar-addr2line"
)

if not os.path.exists(location):
Expand Down
Loading