fix CMakeFlag option

mariadb-corporation · Sep 6, 2024 · 69b67b6 · 69b67b6
1 parent 52c100f
commit 69b67b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -569,6 +569,8 @@ INSTALL (
 )
 CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/columnstoreversion.h.in ${CMAKE_CURRENT_SOURCE_DIR}/columnstoreversion.h)
 
+OPTION (COLUMNSTORE_ALL_STATIC "Build every binari without internal shared libraries" OFF)
+
 SET (
   COLUMSTORE_INSTALL_INTERNAL_SO_LIST
   "usr/lib/*/libbatchloader.so
@@ -613,9 +615,10 @@ IF (COLUMNSTORE_ALL_STATIC)
   SET (COLUMSTORE_INSTALL_INTERNAL_SO_LIST "")
 ENDIF ()
 
+
 CONFIGURE_FILE (
   ${CMAKE_CURRENT_SOURCE_DIR}/debian/mariadb-plugin-columnstore.install.in
-  ${CMAKE_CURRENT_BINARY_DIR}/debian/mariadb-plugin-columnstore.install
+  ${CMAKE_CURRENT_SOURCE_DIR}/debian/mariadb-plugin-columnstore.install
 )
 
 CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/mcsconfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/mcsconfig.h)

diff --git a/build/bootstrap_mcs.sh b/build/bootstrap_mcs.sh
@@ -284,7 +284,7 @@ build()
 
     if [[ $STATIC_BUILD = true ]] ; then
         warn "Building all with static linkage"
-        MDB_CMAKE_FLAGS="${MDB_CMAKE_FLAGS} -DCOLUMNSTORE_ALL_STATIC"
+        MDB_CMAKE_FLAGS="${MDB_CMAKE_FLAGS} -DCOLUMNSTORE_ALL_STATIC:BOOL=ON"
     fi
 
     if [[ $MAKEFILE_VERBOSE = true ]] ; then