Changeset: beeadb0bd3b3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/beeadb0bd3b3
Modified Files:
cmake/Modules/FindValgrind.cmake
gdk/CMakeLists.txt
gdk/gdk_posix.c
Branch: Dec2025
Log Message:
Fix detection of valgrind.
diffs (68 lines):
diff --git a/cmake/Modules/FindValgrind.cmake b/cmake/Modules/FindValgrind.cmake
--- a/cmake/Modules/FindValgrind.cmake
+++ b/cmake/Modules/FindValgrind.cmake
@@ -6,33 +6,21 @@
# VALGRIND_FOUND - True if valgrind found.
find_path(VALGRIND_INCLUDE_DIR
- NAMES valgrind.h)
-
-find_library(VALGRIND_LIBRARIES
- NAMES valgrind)
+ NAMES valgrind.h
+ PATH_SUFFIXES valgrind)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Valgrind
DEFAULT_MSG
- VALGRIND_LIBRARIES
VALGRIND_INCLUDE_DIR)
-mark_as_advanced(VALGRIND_INCLUDE_DIR
- VALGRIND_LIBRARIES)
+mark_as_advanced(VALGRIND_INCLUDE_DIR)
if(VALGRIND_FOUND)
- if(NOT TARGET VALGRIND::VALGRIND AND
- (EXISTS "${VALGRIND_LIBRARIES}"))
+ if(NOT TARGET VALGRIND::VALGRIND)
add_library(VALGRIND::VALGRIND UNKNOWN IMPORTED)
set_target_properties(VALGRIND::VALGRIND
PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${VALGRIND_INCLUDE_DIR}")
-
- if(EXISTS "${VALGRIND_LIBRARIES}")
- set_target_properties(VALGRIND::VALGRIND
- PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES "C"
- IMPORTED_LOCATION "${VALGRIND_LIBRARIES}")
- endif()
endif()
endif()
diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt
--- a/gdk/CMakeLists.txt
+++ b/gdk/CMakeLists.txt
@@ -100,6 +100,7 @@ target_include_directories(bat
$<TARGET_PROPERTY:matomic,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:mstring,INTERFACE_INCLUDE_DIRECTORIES>
$<$<BOOL:${RTREE_FOUND}>:$<TARGET_PROPERTY:rtree::rtree,INTERFACE_INCLUDE_DIRECTORIES>>
+
$<$<BOOL:${VALGRIND_FOUND}>:$<TARGET_PROPERTY:VALGRIND::VALGRIND,INTERFACE_INCLUDE_DIRECTORIES>>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>
$<$<BOOL:${OPENSSL_FOUND}>:${OPENSSL_INCLUDE_DIR}>)
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -46,9 +46,9 @@
#if defined(__GNUC__) && defined(HAVE_VALGRIND)
#include <valgrind.h>
#else
-#define VALGRIND_MALLOCLIKE_BLOCK(addr, sizeB, rzB, is_zeroed)
-#define VALGRIND_FREELIKE_BLOCK(addr, rzB)
-#define VALGRIND_RESIZEINPLACE_BLOCK(addr, oldSizeB, newSizeB, rzB)
+#define VALGRIND_MALLOCLIKE_BLOCK(addr, sizeB, rzB, is_zeroed) ((void) 0)
+#define VALGRIND_FREELIKE_BLOCK(addr, rzB) ((void) 0)
+#define VALGRIND_RESIZEINPLACE_BLOCK(addr, oldSizeB, newSizeB, rzB) ((void) 0)
#endif
#ifndef MAP_NORESERVE
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
