[Firebird-checkins] SF.net SVN: firebird:[60609] firebird/trunk

[<ego...@us...>]

Revision: 60609
          http://sourceforge.net/p/firebird/code/60609
Author:   egorpugin
Date:     2015-02-03 07:10:47 +0000 (Tue, 03 Feb 2015)
Log Message:
-----------
[build] [cmake] Add 'gfix -write async' command on databases during build. Fix clang+linux build.

Modified Paths:
--------------
    firebird/trunk/CMakeLists.txt
    firebird/trunk/builds/cmake/BuildFunctions.cmake
    firebird/trunk/src/CMakeLists.txt

Modified: firebird/trunk/CMakeLists.txt
===================================================================
--- firebird/trunk/CMakeLists.txt	2015-02-03 06:48:50 UTC (rev 60608)
+++ firebird/trunk/CMakeLists.txt	2015-02-03 07:10:47 UTC (rev 60609)
@@ -181,7 +181,7 @@
     endif()
 endif()
 
-if (CLANG OR IOS)
+if (NOT LINUX AND (CLANG OR IOS))
     set(LIB_iconv iconv)
 endif()
 

Modified: firebird/trunk/builds/cmake/BuildFunctions.cmake
===================================================================
--- firebird/trunk/builds/cmake/BuildFunctions.cmake	2015-02-03 06:48:50 UTC (rev 60608)
+++ firebird/trunk/builds/cmake/BuildFunctions.cmake	2015-02-03 07:10:47 UTC (rev 60609)
@@ -113,6 +113,7 @@
                 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()

Modified: firebird/trunk/src/CMakeLists.txt
===================================================================
--- firebird/trunk/src/CMakeLists.txt	2015-02-03 06:48:50 UTC (rev 60608)
+++ firebird/trunk/src/CMakeLists.txt	2015-02-03 07:10:47 UTC (rev 60609)
@@ -119,8 +119,10 @@
     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 @@
     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
@@ -745,6 +748,15 @@
 
 
 ########################################
+# 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
 ########################################
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.