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

Configure cmake correctly for both native & cross builds

Browse Source
This commit is contained in:
AlexPeshkoff 2024-06-19 14:53:10 +03:00
parent b7c61ede11
commit dfd364aeb0
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builds/posix/Makefile.in
View File

@ -130,6 +130,8 @@ RPL_AWK=$(GEN_ROOT)/def_awk
RPL_AWK_SRC=$(MISC)/def_awk.c
RPL_GREP=$(GEN_ROOT)/isc_grep
RPL_GREP_SRC=$(MISC)/isc_grep.c
CDS_CONF_SRC=configure.cmake
CDS_CONF_FILE=$(ROOT)/extern/libcds/$(CDS_CONF_SRC)
updateCloopInterfaces : $(API_H_FILE) $(API_PAS_FILE)
@ -326,6 +328,7 @@ master_process:
ln -sf $(SRC_ROOT)/include/gen/autoconfig.auto $(SRC_ROOT)/include/gen/autoconfig.h
$(MAKE) updateBuildNum
$(MAKE) export_lists
$(RM) $(CDS_CONF_FILE); touch $(CDS_CONF_FILE)
$(MAKE) external
$(MAKE) updateCloopInterfaces
$(MAKE) rest
@ -361,6 +364,7 @@ cross1:
ln -sf $(SRC_ROOT)/include/gen/autoconfig.auto $(SRC_ROOT)/include/gen/autoconfig.h
$(MAKE) updateBuildNum
$(MAKE) export_lists
$(RM) $(CDS_CONF_FILE); touch $(CDS_CONF_FILE)
$(MAKE) external
$(MAKE) updateCloopInterfaces
ifeq ($(CLIENT_ONLY_FLG),N)
@ -390,6 +394,7 @@ ifeq ($(WITH_TOMCRYPT),Y)
endif
ifeq ($(CLIENT_ONLY_FLG),N)
$(MAKE) re2
[ -f $(CDS_CONF_SRC) ] && $(CP) $(CDS_CONF_SRC) $(CDS_CONF_FILE)
$(MAKE) libcds
endif
CC="$(CC)" CFLAGS="$(CFLAGS)" AR="$(AR)" $(MAKE) -C $(ROOT)/extern/decNumber

6
configure.ac
View File

@ -1519,6 +1519,12 @@ gen/Release/firebird/bin/registerDatabase.sh:builds/install/posix-common/registe
])
fi
if [[[ x$CROSS = xios* ]]]; then
AC_CONFIG_FILES([
gen/configure.cmake:builds/posix/ios_cross_linux.cmake
])
fi
AC_CONFIG_FILES([
gen/vers.sh:builds/posix/vers.sh.in
])

5
extern/libcds/CMakeLists.txt vendored
View File

@ -5,10 +5,7 @@ if(POLICY CMP0042)
cmake_policy(SET CMP0042 NEW)
endif()
SET(CMAKE_SYSTEM_NAME Darwin)
SET(CMAKE_C_COMPILER arm-apple-darwin11-clang)
SET(CMAKE_CXX_COMPILER arm-apple-darwin11-clang++)
SET(CMAKE_LINKER arm-apple-darwin11-ld)
include(configure.cmake)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/build/cmake ${CMAKE_MODULE_PATH})
include(TargetArch)