Changeset: 445301472742 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/445301472742
Modified Files:
cmake/monetdb-defines.cmake
gdk/CMakeLists.txt
monetdb5/mal/mal_profiler.c
tools/mserver/CMakeLists.txt
Branch: default
Log Message:
small changes for compilation on freebsd
diffs (64 lines):
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -46,7 +46,10 @@ function(monetdb_configure_defines)
check_include_file("sys/un.h" HAVE_SYS_UN_H)
check_include_file("sys/wait.h" HAVE_SYS_WAIT_H)
check_include_file("unistd.h" HAVE_UNISTD_H)
- check_include_file("uuid/uuid.h" HAVE_UUID_UUID_H)
+ cmake_push_check_state()
+ set(CMAKE_REQUIRED_INCLUDES
"${CMAKE_REQUIRED_INCLUDES};${UUID_INCLUDE_DIR}")
+ check_include_file("uuid/uuid.h" HAVE_UUID_UUID_H)
+ cmake_pop_check_state()
check_include_file("winsock2.h" HAVE_WINSOCK_H)
find_library(GETOPT_LIB "getopt.lib")
diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt
--- a/gdk/CMakeLists.txt
+++ b/gdk/CMakeLists.txt
@@ -89,6 +89,7 @@ target_sources(bat
target_include_directories(bat
PUBLIC
+
$<$<BOOL:${UUID_FOUND}>:$<TARGET_PROPERTY:UUID::UUID,INTERFACE_INCLUDE_DIRECTORIES>>
$<TARGET_PROPERTY:stream,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:matomic,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:mstring,INTERFACE_INCLUDE_DIRECTORIES>
@@ -105,6 +106,7 @@ target_link_libraries(bat
mutils
$<$<NOT:$<PLATFORM_ID:Windows>>:m>
$<$<PLATFORM_ID:Windows>:ws2_32>
+ $<$<BOOL:${UUID_FOUND}>:UUID::UUID>
$<$<BOOL:${KVM_FOUND}>:KVM::KVM>
${CMAKE_DL_LIBS}
Threads::Threads)
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -487,12 +487,12 @@ renderProfilerEvent(Client cntxt, MalBlk
* We should use an OS define to react to the maximal cores
*/
-#define MAXCPU 256
-#define LASTCPU (MAXCPU - 1)
+#define MAXCORES 256
+#define LASTCPU (MAXCORES - 1)
static struct{
lng user, nice, system, idle, iowait;
double load;
-} corestat[MAXCPU];
+} corestat[MAXCORES];
static int
getCPULoad(char cpuload[BUFSIZ]){
diff --git a/tools/mserver/CMakeLists.txt b/tools/mserver/CMakeLists.txt
--- a/tools/mserver/CMakeLists.txt
+++ b/tools/mserver/CMakeLists.txt
@@ -80,6 +80,7 @@ target_link_libraries(shutdowntest
bat
stream
monetdb5
+ $<$<NOT:$<PLATFORM_ID:Windows>>:m>
$<$<PLATFORM_ID:Windows>:${GETOPT_LIB}>
Threads::Threads)
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
