[DNM] [v23.2.x] cmake tweaks for vtools trunk-based development

CMakeLists.txt

@@ -1,8 +1,13 @@
-cmake_minimum_required(VERSION 3.12.0)
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-# keep this minimal. modify `cmake/main.cmake` file instead
-if(NOT VECTORIZED_CMAKE_DIR)
-  include(main)
-else()
-  include(${VECTORIZED_CMAKE_DIR}/main.cmake)
+# Redirect control for internal Redpanda builds
+if(REDPANDA_CMAKE_DIR)
+  cmake_minimum_required(VERSION 3.22)
+  list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+  include(${REDPANDA_CMAKE_DIR}/main.cmake)
+  return()
 endif()
+
+cmake_minimum_required(VERSION 3.24)
+project(redpanda LANGUAGES CXX)
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+include(main)

build.sh

@@ -30,7 +30,6 @@ cmake -DCMAKE_BUILD_TYPE=Release \
   -GNinja \
   -DCMAKE_C_COMPILER=$CC \
   -DCMAKE_CXX_COMPILER=$CXX \
-  -DCMAKE_GO_BINARY="$go" \
   "$@"
 
 (cd "$root"/build && ninja)

src/CMakeLists.txt

@@ -4,5 +4,6 @@ find_package(Boost REQUIRED
     iostreams
     unit_test_framework)
 find_package(absl REQUIRED)
+find_program(GO_PROGRAM go REQUIRED)
 add_subdirectory(v)
 add_subdirectory(go/kreq-gen)

src/go/kreq-gen/CMakeLists.txt

@@ -2,11 +2,11 @@ set(GOPATH ${CMAKE_CURRENT_BINARY_DIR})
 
 function(add_go_dependency NAME MAIN_SRC)
   get_filename_component(MAIN_SRC_ABS ${MAIN_SRC} ABSOLUTE)
-  add_custom_target(${NAME})
-  add_custom_command(TARGET ${NAME}
-                    COMMAND env GOPATH=${GOPATH} ${CMAKE_GO_BINARY} build
+  string(REPLACE "-" "_" target_name ${NAME})
+  add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${NAME}"
+                    COMMAND env GOPATH=${GOPATH} ${GO_PROGRAM} build
                     -modcacherw -o "${CMAKE_CURRENT_BINARY_DIR}/${NAME}"
-                    ${CMAKE_GO_FLAGS} ${MAIN_SRC}
+                    ${MAIN_SRC}
                     WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
                     DEPENDS ${MAIN_SRC_ABS})
   add_custom_target(${NAME}_all ALL DEPENDS ${NAME})

tools/cmake_test.py

@@ -133,15 +133,15 @@ def _find_addr2lines(self):
         # Workstation: find our build directory by searching back from binary
         path_parts = self.binary.split("/")
         try:
-            vbuild = "/".join(path_parts[0:path_parts.index("vbuild") + 3])
+            vbuild = "/".join(path_parts[0:path_parts.index("vbuild") + 5])
         except (ValueError, IndexError):
             sys.stderr.write(
                 f"Could not find vbuild in binary path {self.binary}\n")
             return
         else:
             location = os.path.join(
                 vbuild,
-                "v_deps_build/seastar-prefix/src/seastar/scripts/seastar-addr2line"
+                "deps_build/seastar-prefix/src/seastar/scripts/seastar-addr2line"
             )
 
             if not os.path.exists(location):