Changeset: 7c5b9927bb0a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7c5b9927bb0a
Modified Files:
cmake/monetdb-defines.cmake
monetdb_config.h.in
Branch: Mar2025
Log Message:
Always set BUILD_TYPE and EXTRA_C_FLAGS in monetdb_config.h, even when empty.
diffs (35 lines):
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -147,7 +147,7 @@ macro(monetdb_macro_variables)
set(HAVE_RTREE ${RTREE_FOUND})
set(HAVE_OPENSSL ${OPENSSL_FOUND})
- set(BUILD_TYPE ${CMAKE_BUILD_TYPE})
+ set(BUILD_TYPE "${CMAKE_BUILD_TYPE}")
if(CMAKE_BUILD_TYPE)
if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS_DEBUG}")
@@ -158,6 +158,8 @@ macro(monetdb_macro_variables)
else (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
endif ()
+ else()
+ set(EXTRA_C_FLAGS "")
endif()
if(MALLOC_FOUND)
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -194,8 +194,8 @@
#cmakedefine HAVE_LIBPY3 1
#cmakedefine HAVE_OPENSSL 1
-#cmakedefine BUILD_TYPE "@BUILD_TYPE@"
-#cmakedefine EXTRA_C_FLAGS "@EXTRA_C_FLAGS@"
+#define BUILD_TYPE "@BUILD_TYPE@"
+#define EXTRA_C_FLAGS "@EXTRA_C_FLAGS@"
#cmakedefine WITH_JEMALLOC 1
#cmakedefine WITH_MIMALLOC 1
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
