Changeset: 12d580ec0cdc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/12d580ec0cdc
Modified Files:
MonetDB.spec
cmake/monetdb-defines.cmake
debian/rules
tools/mserver/CMakeLists.txt
Branch: Mar2025
Log Message:
Some fixes to getting the compiler and build type into the binary.
Also, build releases with build type Release.
diffs (57 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -964,6 +964,7 @@ sed -i 's/1\.2/1.1/' misc/selinux/monetd
%endif
%cmake3 \
+ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_RUNSTATEDIR=/run \
-DRELEASE_VERSION=ON \
-DASSERT=OFF \
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -158,8 +158,11 @@ macro(monetdb_macro_variables)
else (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
endif ()
+ if(NOT "${CMAKE_C_FLAGS}" STREQUAL "")
+ string(APPEND EXTRA_C_FLAGS " " ${CMAKE_C_FLAGS})
+ endif()
else()
- set(EXTRA_C_FLAGS "")
+ set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS}")
endif()
if(MALLOC_FOUND)
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ DH_VERBOSE=1
override_dh_auto_configure:
dh_auto_configure -- \
-DPYTHON3_LIBDIR=lib/python3/dist-packages \
+ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_RUNSTATEDIR=/run \
-DRELEASE_VERSION=ON \
-DASSERT=OFF \
diff --git a/tools/mserver/CMakeLists.txt b/tools/mserver/CMakeLists.txt
--- a/tools/mserver/CMakeLists.txt
+++ b/tools/mserver/CMakeLists.txt
@@ -25,12 +25,11 @@ string(APPEND builtby "@" ${host})
set(compilercall ${CMAKE_C_COMPILER})
set(linkercall ${CMAKE_LINKER})
-if(${CMAKE_BUILD_TYPE})
+if(CMAKE_BUILD_TYPE)
string(TOUPPER ${CMAKE_BUILD_TYPE} build_type)
- string(APPEND compilercall " " ${CMAKE_C_FLAGS_${build_type}}
${CMAKE_C_FLAGS})
-else()
- string(APPEND compilercall " " ${CMAKE_C_FLAGS})
+ string(APPEND compilercall " " ${CMAKE_C_FLAGS_${build_type}})
endif()
+string(APPEND compilercall " " ${CMAKE_C_FLAGS})
configure_file(monet_version.c.in
${CMAKE_CURRENT_BINARY_DIR}/monet_version.c
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
