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

Update and fix cmake build.

Browse Source
This commit is contained in:
Egor Pugin 2017-12-02 19:40:30 +03:00
parent 202f4f6321
commit 5e6135a959
6 changed files with 45 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
CMakeLists.txt
View File

@ -212,7 +212,7 @@ if (UNIX)
set(OS_DIR posix)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -msse4 -std=c++11")
if (NOT CMAKE_CROSSCOMPILING)
set(LIB_readline readline)
@ -322,6 +322,8 @@ endif() # if (NOT CMAKE_CROSSCOMPILING)
crosscompile_prebuild_steps()
include_directories("extern/libtommath")
include_directories("extern/libtomcrypt/src/headers")
include_directories("extern/decNumber")
include_directories("extern/icu/include")
include_directories("extern/zlib")
@ -339,6 +341,33 @@ file(GLOB libtommath_src "extern/libtommath/*.c" "extern/libtommath/*.h")
add_library (libtommath ${libtommath_src})
project_group (libtommath Extern)
########################################
# LIBRARY libtomcrypt
########################################
file(GLOB_RECURSE libtomcrypt_src "extern/libtomcrypt/src/*")
list(FILTER libtomcrypt_src EXCLUDE REGEX ".*aes_tab.c")
list(FILTER libtomcrypt_src EXCLUDE REGEX ".*whirltab.c")
list(FILTER libtomcrypt_src EXCLUDE REGEX ".*sober128tab.c")
add_library (libtomcrypt ${libtomcrypt_src})
target_compile_definitions (libtomcrypt PRIVATE LTC_NO_ROLC)
project_group (libtomcrypt Extern)
########################################
# LIBRARY decNumber
########################################
file(GLOB_RECURSE decNumber_src "extern/decNumber/*.c" "extern/decNumber/*.h")
list(FILTER decNumber_src EXCLUDE REGEX ".*decBasic.c")
list(FILTER decNumber_src EXCLUDE REGEX ".*decCommon.c")
add_library (decNumber ${decNumber_src})
project_group (decNumber Extern)
########################################
# EXECUTABLE btyacc
########################################

1
builds/cmake/Configure.cmake
View File

@ -200,6 +200,7 @@ set(functions_list
accept4
AO_compare_and_swap_full
clock_gettime
ctime_r
dirname
fallocate
fchmod

2
extern/btyacc/main.c vendored
View File

@ -2,7 +2,7 @@
#include <signal.h>
#include <stdio.h>
#if defined(WIN32)
#if defined(_WIN32)
#include <io.h>
#else
#include <unistd.h>

58
src/CMakeLists.txt
View File

@ -256,6 +256,10 @@ add_custom_command(
COMMAND sed -n "/%type .*/p" ${CMAKE_CURRENT_SOURCE_DIR}/dsql/parse.y > types.y
COMMAND sed "s/%type .*//" ${CMAKE_CURRENT_SOURCE_DIR}/dsql/parse.y > y.y
COMMAND btyacc -l -d -S ${CMAKE_CURRENT_SOURCE_DIR}/dsql/btyacc_fb.ske y.y
COMMAND sed -i "s/#define \\([A-Z].*\\)/#define TOK_\\1/g" y_tab.h
COMMAND sed -i "s/#define TOK_YY\\(.*\\)/#define YY\\1/g" y_tab.h
COMMAND ${CMAKE_COMMAND} -E copy_if_different y_tab.h include/gen/parse.h
COMMAND ${CMAKE_COMMAND} -E copy_if_different y_tab.c dsql/parse.cpp
COMMENT "Generating parse.cpp, parse.h"
@ -263,7 +267,7 @@ add_custom_command(
)
add_custom_target(parse
DEPENDS y_tab.h y_tab.c
SOURCES ${parse_src}
SOURCES ${parse_src} y_tab.h y_tab.c
)
project_group(parse "Boot/Custom build steps")
set_source_files_properties(dsql/parse.cpp include/gen/parse.h PROPERTIES GENERATED TRUE)
@ -369,8 +373,11 @@ if (APPLE)
endif()
add_library (common ${common_src} ${common_os_src} ${common_include})
target_link_libraries (common ${LIB_mpr})
target_link_libraries (common ${LIB_mpr} libtommath libtomcrypt decNumber)
add_dependencies_cc (common UpdateCloopInterfaces)
if (UNIX)
target_link_libraries (common dl)
endif()
################################################################################
@ -412,7 +419,6 @@ add_library (boot_yvalve SHARED $<TARGET_OBJECTS:yvalve_common>
target_link_libraries (boot_yvalve
PRIVATE remote
PRIVATE common
PUBLIC libtommath
PUBLIC ${LIB_Ws2_32}
PUBLIC ${LIB_readline}
PUBLIC ${LIB_dl}
@ -435,7 +441,6 @@ add_library (yvalve SHARED $<TARGET_OBJECTS:yvalve_common> ${yva
target_link_libraries (yvalve
PRIVATE remote
PRIVATE common
PUBLIC libtommath
PUBLIC ${LIB_Ws2_32}
PUBLIC ${LIB_readline}
PUBLIC ${LIB_dl}
@ -538,17 +543,6 @@ set_exported_symbols (ib_util ib_util)
set_output_directory_unix (ib_util lib)
########################################
# SHARED LIBRARY ib_udf
########################################
add_library (ib_udf SHARED extlib/ib_udf.cpp extlib/ib_udf.h ${VERSION_RC})
target_link_libraries (ib_udf ib_util)
set_target_properties (ib_udf PROPERTIES PREFIX "")
set_exported_symbols (ib_udf ib_udf)
set_output_directory (ib_udf UDF)
########################################
# SHARED LIBRARY legacy_usermanager
########################################
@ -578,27 +572,6 @@ set_output_directory (udr_engine plugins)
set_exported_symbols (udr_engine fbplugin)
########################################
# SHARED LIBRARY fbudf
########################################
set(fbudf_src
extlib/fbudf/fbudf.cpp
extlib/fbudf/stdafx.cpp
extlib/fbudf/fbudf.txt
extlib/fbudf/fbudf.sql
jrd/ibase.h
)
file(GLOB fbudf_include "extlib/fbudf/*.h")
add_library (fbudf SHARED ${fbudf_src} ${fbudf_include} ${VERSION_RC})
target_link_libraries (fbudf common yvalve)
set_target_properties (fbudf PROPERTIES PREFIX "")
set_output_directory (fbudf UDF)
########################################
# SHARED LIBRARY srp
########################################
@ -945,10 +918,6 @@ add_custom_target(copy_files
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/misc/IDPLicense.txt ${output_dir}/IDPLicense.txt
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/src/utilities/ntrace/fbtrace.conf ${output_dir}/fbtrace.conf
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/src/plugins/udr_engine/udr_engine.conf ${output_dir}/plugins/udr_engine.conf
# udf
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/src/extlib/ib_udf.sql ${output_dir}/UDF/ib_udf.sql
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/src/extlib/ib_udf2.sql ${output_dir}/UDF/ib_udf2.sql
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/src/extlib/fbudf/fbudf.sql ${output_dir}/UDF/fbudf.sql
# docs
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/CHANGELOG.md ${output_dir}/doc/CHANGELOG.md
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/README.md ${output_dir}/doc/README.md
@ -1048,15 +1017,6 @@ if (WIN32)
COMMAND sed -f ${CMAKE_SOURCE_DIR}/src/misc/headers.sed < ${output_dir}/include/ibase.tmp > ${output_dir}/include/ibase.h
COMMAND ${CMAKE_COMMAND} -E remove ${output_dir}/include/ibase.tmp
)
file(GLOB files
"${CMAKE_SOURCE_DIR}/src/extlib/ib_udf*"
"${CMAKE_SOURCE_DIR}/src/extlib/fbudf/*"
)
foreach(F ${files})
get_filename_component(name ${F} NAME)
add_custom_command(TARGET copy_files POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${F} ${output_dir}/examples/udf/${name})
endforeach()
endif()

4
src/common/os/win32/mod_loader.cpp
View File

@ -101,9 +101,7 @@ public:
"msvcr110.dll",
#elif _MSC_VER == 1800
"msvcr120.dll",
#elif _MSC_VER == 1900
"vcruntime140.dll",
#elif _MSC_VER == 1910
#elif _MSC_VER >= 1900 && _MSC_VER <= 1912
"vcruntime140.dll",
#else
#error Specify CRT DLL name here !

3
src/include/gen/autoconfig.h.in
View File

@ -403,6 +403,9 @@
/* Define to 1 if you have the `clock_gettime' function. */
#cmakedefine HAVE_CLOCK_GETTIME 1
/* Define to 1 if you have the `ctime_r' function. */
#cmakedefine HAVE_CTIME_R 1
/* Define to 1 if you have the `dirname' function. */
#cmakedefine HAVE_DIRNAME 1