Changeset: 36b7db5a3fc5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/36b7db5a3fc5
Modified Files:
cmake/monetdb-defines.cmake
cmake/monetdb-functions.cmake
monetdb_config.h.in
tools/mserver/mserver5.c
Branch: Mar2025
Log Message:
Expose cmake build type and extra C flags
diffs (67 lines):
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -147,6 +147,17 @@ macro(monetdb_macro_variables)
set(HAVE_RTREE ${RTREE_FOUND})
set(HAVE_OPENSSL ${OPENSSL_FOUND})
+ set(BUILD_TYPE ${CMAKE_BUILD_TYPE})
+ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+ set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS_DEBUG}")
+ elseif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
+ set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS_RELEASE}")
+ elseif (${CMAKE_BUILD_TYPE} STREQUAL "MinSizeRel")
+ set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS_MINSIZEREL}")
+ else (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
+ set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+ endif ()
+
if(MALLOC_FOUND)
if(${WITH_MALLOC} STREQUAL "jemalloc")
set(WITH_JEMALLOC 1)
diff --git a/cmake/monetdb-functions.cmake b/cmake/monetdb-functions.cmake
--- a/cmake/monetdb-functions.cmake
+++ b/cmake/monetdb-functions.cmake
@@ -111,7 +111,16 @@ function(monetdb_cmake_summary)
message(STATUS "Sphinx: ${SPHINX_FOUND}")
message(STATUS "Semodule: ${SEMODULE_FOUND}")
message(STATUS "Awk: ${AWK_FOUND}")
- message(STATUS "flags: ${CMAKE_C_FLAGS}")
+ message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
+ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+ message(STATUS "Extra C flags: ${CMAKE_C_FLAGS_DEBUG}")
+ elseif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
+ message(STATUS "Extra C flags: ${CMAKE_C_FLAGS_RELEASE}")
+ elseif (${CMAKE_BUILD_TYPE} STREQUAL "MinSizeRel")
+ message(STATUS "Extra C flags: ${CMAKE_C_FLAGS_MINSIZEREL}")
+ else (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
+ message(STATUS "Extra C flags: ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+ endif ()
message(STATUS "-----------------------------------------")
message(STATUS "")
endfunction()
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -194,6 +194,9 @@
#cmakedefine HAVE_LIBPY3 1
#cmakedefine HAVE_OPENSSL 1
+#cmakedefine BUILD_TYPE "@BUILD_TYPE@"
+#cmakedefine EXTRA_C_FLAGS "@EXTRA_C_FLAGS@"
+
#cmakedefine WITH_JEMALLOC 1
#cmakedefine WITH_MIMALLOC 1
#cmakedefine WITH_TCMALLOC 1
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -725,6 +725,8 @@ main(int argc, char **av)
mo_free_options(set, setlen);
if (GDKsetenv("monet_version", GDKversion()) != GDK_SUCCEED
+ || GDKsetenv("monet_build_type", BUILD_TYPE) != GDK_SUCCEED
+ || GDKsetenv("monet_extra_c_flags", EXTRA_C_FLAGS) !=
GDK_SUCCEED
|| GDKsetenv("monet_release",
#ifdef MONETDB_RELEASE
MONETDB_RELEASE
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
