firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 16:43:03 +01:00
Code Issues

[build] [cmake] Add 'gfix -write async' command on databases during build. Fix clang+linux build.

Browse Source
This commit is contained in:
egorpugin 2015-02-03 07:10:47 +00:00
parent 7c6a608ad8
commit 269e1a26ab
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -181,7 +181,7 @@ if (UNIX)
endif()
endif()
if (CLANG OR IOS)
if (NOT LINUX AND (CLANG OR IOS))
set(LIB_iconv iconv)
endif()

1
builds/cmake/BuildFunctions.cmake
View File

@ -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()

12
src/CMakeLists.txt
View File

@ -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
########################################