tjh.dev
1diff --git a/cmake/main.cmake b/cmake/main.cmake
2index 8c60c4214..194f33a21 100644
3--- a/cmake/main.cmake
4+++ b/cmake/main.cmake
5@@ -15,15 +15,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
6 set(CMAKE_UNITY_BUILD_BATCH_SIZE 10)
7 set(CMAKE_CXX_EXTENSIONS OFF)
8 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
9-list(APPEND BASE_LD_FLAGS_LIST
10- -L${REDPANDA_DEPS_INSTALL_DIR}/lib
11- -L${REDPANDA_DEPS_INSTALL_DIR}/lib64
12- -fuse-ld=lld)
13-set(PKG_CONFIG_PATH_LIST
14- ${REDPANDA_DEPS_INSTALL_DIR}/lib64/pkgconfig
15- ${REDPANDA_DEPS_INSTALL_DIR}/share/pkgconfig
16- ${REDPANDA_DEPS_INSTALL_DIR}/lib/pkgconfig
17- )
18
19 list(APPEND BASE_CXX_FLAGS_LIST -fPIC)
20 list(APPEND BASE_C_FLAGS_LIST -fPIC)
21diff --git a/cmake/testing.cmake b/cmake/testing.cmake
22index 7f149dc82..7c57aa3dd 100644
23--- a/cmake/testing.cmake
24+++ b/cmake/testing.cmake
25@@ -24,6 +24,7 @@ message(STATUS "RP_ENABLE_BENCHMARK_TESTS=${RP_ENABLE_BENCHMARK_TESTS}")
26 message(STATUS "RP_ENABLE_HONEY_BADGER_TESTS=${RP_ENABLE_HONEY_BADGER_TESTS}")
27
28 function (rp_test)
29+ return()
30 set(options
31 INTEGRATION_TEST UNIT_TEST BENCHMARK_TEST HBADGER_TEST)
32 set(oneValueArgs BINARY_NAME TIMEOUT PREPARE_COMMAND POST_COMMAND)
33diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
34index eecd145ed..b9efa89b5 100644
35--- a/src/CMakeLists.txt
36+++ b/src/CMakeLists.txt
37@@ -5,4 +5,5 @@ find_package(Boost REQUIRED
38 unit_test_framework)
39 find_package(absl REQUIRED)
40 add_subdirectory(v)
41-add_subdirectory(go/kreq-gen)
42+# Don't build kafka-request-generator, it is needed only for tests
43+# add_subdirectory(go/kreq-gen)
44diff --git a/src/v/CMakeLists.txt b/src/v/CMakeLists.txt
45index 075da485e..af7ede2bc 100644
46--- a/src/v/CMakeLists.txt
47+++ b/src/v/CMakeLists.txt
48@@ -58,7 +58,9 @@ else()
49 if(${ENABLE_GIT_HASH})
50 message(FATAL_ERROR "ENABLE_GIT_HASH cannot be 'on' when ENABLE_GIT_VERSION is 'off'")
51 endif()
52- set(GIT_VER "no_version")
53+ if(NOT GIT_VER)
54+ set(GIT_VER "no_version")
55+ endif()
56 endif()
57
58 if(${ENABLE_GIT_HASH})
59@@ -71,8 +73,12 @@ if(${ENABLE_GIT_HASH})
60 set(GIT_CLEAN_DIRTY "")
61 endif()
62 else()
63- set(GIT_SHA1 "000")
64- set(GIT_CLEAN_DIRTY "-dev")
65+ if(NOT GIT_SHA1)
66+ set(GIT_SHA1 "000")
67+ endif()
68+ if(NOT GIT_CLEAN_DIRTY)
69+ set(GIT_CLEAN_DIRTY "-dev")
70+ endif()
71 endif()
72
73 configure_file(version.h.in version.h @ONLY)