From 269e1a26ab07779f24c6aee8a412ce4a36befe42 Mon Sep 17 00:00:00 2001
From: egorpugin <egorpugin@users.sourceforge.net>
Date: Tue, 3 Feb 2015 07:10:47 +0000
Subject: [PATCH] [build] [cmake] Add 'gfix -write async' command on databases
 during build. Fix clang+linux build.

---
 CMakeLists.txt                    |  2 +-
 builds/cmake/BuildFunctions.cmake |  1 +
 src/CMakeLists.txt                | 12 ++++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3776b32ed..7cfaefa617 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -181,7 +181,7 @@ if (UNIX)
     endif()
 endif()
 
-if (CLANG OR IOS)
+if (NOT LINUX AND (CLANG OR IOS))
     set(LIB_iconv iconv)
 endif()
 
diff --git a/builds/cmake/BuildFunctions.cmake b/builds/cmake/BuildFunctions.cmake
index f45cb0f13e..57fa9c2aca 100644
--- a/builds/cmake/BuildFunctions.cmake
+++ b/builds/cmake/BuildFunctions.cmake
@@ -113,6 +113,7 @@ function(epp_process type files)
                 COMMAND ${CMAKE_COMMAND} -E copy_if_different security.fdb ${dir}/security.fdb
                 COMMAND ${CMAKE_COMMAND} -E copy_if_different msg.fdb ${dir}/msg.fdb
                 COMMAND ${CMAKE_COMMAND} -E copy_if_different help.fdb ${dir}/help.fdb
+                COMMAND boot_gfix -write async ${dir}/security.fdb
                 COMMAND ${ARGN} -b ${dir}/ ${in} ${out}
             )
         endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7fd8b4551c..cc2e056715 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -119,8 +119,10 @@ add_custom_command(
     COMMAND ${CMAKE_COMMAND} -E remove security_.fdb
     COMMAND ${CMAKE_COMMAND} -E echo "create database 'security_.fdb';" > create_db_security.sql
     COMMAND boot_isql -q -i create_db_security.sql
+    COMMAND boot_gfix -write async security_.fdb
     COMMAND boot_isql -q security_.fdb -i ${CMAKE_CURRENT_SOURCE_DIR}/dbs/security.sql
     COMMAND ${CMAKE_COMMAND} -E copy_if_different security_.fdb security.fdb
+    COMMAND boot_gfix -write sync security.fdb
 )
 add_custom_command(
     OUTPUT metadata.fdb
@@ -205,6 +207,7 @@ add_custom_command(
     COMMAND ${CMAKE_COMMAND} -E remove msg_.fdb
     COMMAND ${CMAKE_COMMAND} -E echo "create database 'msg_.fdb';" > create_db_msg.sql
     COMMAND boot_isql -q -i create_db_msg.sql
+    COMMAND boot_gfix -write async msg_.fdb
     COMMAND ${isql_exec_msg}/msg.sql
     #
     COMMAND echo loading facilities
@@ -744,6 +747,15 @@ add_executable              (fbtracemgr ${fbtracemgr_src} ${VERSION_RC})
 target_link_libraries       (fbtracemgr common yvalve)
 
 
+########################################
+# EXECUTABLE boot_gfix
+########################################
+
+add_executable              (boot_gfix alice/main/aliceMain.cpp ${VERSION_RC})
+target_link_libraries       (boot_gfix boot_alice common boot_yvalve)
+project_group               (boot_gfix Boot)
+
+
 ########################################
 # EXECUTABLE gfix
 ########################################