1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
|
--- cmake/Functions.cmake.orig 2024-02-10 00:23:21 UTC
+++ cmake/Functions.cmake
@@ -416,7 +416,7 @@ function(add_linker_options target buildDir completeSt
set(libs_rsp "${buildDir}/${ninjaTarget}_libs.rsp")
set(ldir_rsp "${buildDir}/${ninjaTarget}_ldir.rsp")
set_target_properties(${cmakeTarget} PROPERTIES STATIC_LIBRARY_OPTIONS "@${objects_rsp}")
- if(LINUX OR ANDROID)
+ if(LINUX OR ANDROID OR FREEBSD)
get_gn_arch(cpu ${TEST_architecture_arch})
if(CMAKE_CROSSCOMPILING AND cpu STREQUAL "arm" AND ${config} STREQUAL "Debug")
target_link_options(${cmakeTarget} PRIVATE "LINKER:--long-plt")
@@ -673,6 +673,8 @@ function(get_gn_os result)
set(${result} "mac" PARENT_SCOPE)
elseif(IOS)
set(${result} "ios" PARENT_SCOPE)
+ elseif(FREEBSD)
+ set(${result} "freebsd" PARENT_SCOPE)
else()
message(DEBUG "Unrecognized OS")
endif()
@@ -865,7 +867,7 @@ macro(append_build_type_setup)
extend_gn_list(gnArgArg
ARGS enable_precompiled_headers
- CONDITION BUILD_WITH_PCH AND NOT LINUX
+ CONDITION BUILD_WITH_PCH AND NOT LINUX AND NOT FREEBSD
)
extend_gn_list(gnArgArg
ARGS dcheck_always_on
@@ -917,7 +919,7 @@ macro(append_compiler_linker_sdk_setup)
use_libcxx=true
)
endif()
- if(DEFINED QT_FEATURE_stdlib_libcpp AND LINUX)
+ if(DEFINED QT_FEATURE_stdlib_libcpp AND (LINUX OR FREEBSD))
extend_gn_list(gnArgArg ARGS use_libcxx
CONDITION QT_FEATURE_stdlib_libcpp
)
@@ -955,7 +957,7 @@ macro(append_compiler_linker_sdk_setup)
)
endif()
get_gn_arch(cpu ${TEST_architecture_arch})
- if(LINUX AND CMAKE_CROSSCOMPILING AND cpu STREQUAL "arm")
+ if((LINUX OR FREEBSD) AND CMAKE_CROSSCOMPILING AND cpu STREQUAL "arm")
extend_gn_list_cflag(gnArgArg
ARG arm_tune
@@ -1040,7 +1042,7 @@ macro(append_toolchain_setup)
host_cpu="${cpu}"
)
endif()
- elseif(LINUX)
+ elseif(LINUX OR FREEBSD)
get_gn_arch(cpu ${TEST_architecture_arch})
list(APPEND gnArgArg
custom_toolchain="${buildDir}/target_toolchain:target"
@@ -1073,7 +1075,7 @@ macro(append_pkg_config_setup)
macro(append_pkg_config_setup)
- if(LINUX)
+ if(LINUX OR FREEBSD)
list(APPEND gnArgArg
pkg_config="${PKG_CONFIG_EXECUTABLE}"
host_pkg_config="${PKG_CONFIG_HOST_EXECUTABLE}"
@@ -1166,6 +1168,20 @@ function(add_gn_build_artifacts_to_target)
set_target_properties(${arg_CMAKE_TARGET} PROPERTIES
LINK_DEPENDS ${arg_BUILDDIR}/${config}/${arch}/${arg_NINJA_STAMP}
)
+ # For some reason when the build of QtWebEngine's "convert_dict" is
+ # completed the "convert_dict.stamp" isn't created.
+ #
+ # Work around this issue by creating "convert_dict.stamp" manually.
+ if(${arg_NINJA_TARGET} STREQUAL "convert_dict")
+ add_custom_command(
+ POST_BUILD
+ COMMENT "Add workaround for missing ${arg_NINJA_TARGET}.stamp file after build"
+ COMMAND ${CMAKE_COMMAND} -E touch ${buildDir}/${config}/${arch}/${arg_NINJA_TARGET}.stamp
+ TARGET ${target}
+ DEPENDS run_${module}_NinjaDone
+ USES_TERMINAL
+ )
+ endif()
if(QT_IS_MACOS_UNIVERSAL)
add_intermediate_archive(${target} ${arg_BUILDDIR}/${config}/${arch} ${arg_COMPLETE_STATIC})
elseif(IOS)
@@ -1283,7 +1299,7 @@ function(check_for_ulimit)
function(check_for_ulimit)
message("-- Checking 'ulimit -n'")
- execute_process(COMMAND bash -c "ulimit -n"
+ execute_process(COMMAND sh -c "ulimit -n"
OUTPUT_VARIABLE ulimitOutput
)
string(REGEX MATCHALL "[0-9]+" limit "${ulimitOutput}")
@@ -1292,7 +1308,7 @@ function(check_for_ulimit)
if(NOT ${CMAKE_VERSION} VERSION_LESS "3.21.0")
message(" -- Creating linker launcher")
file(GENERATE OUTPUT ${PROJECT_BINARY_DIR}/linker_ulimit.sh
- CONTENT "#!/bin/bash\nulimit -n 4096\nexec \"$@\""
+ CONTENT "#!/bin/sh\nulimit -n 4096\nexec \"$@\""
FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
)
set(COIN_BUG_699 ON PARENT_SCOPE)
|
