diff options
| author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-06-04 17:09:14 +0200 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-06-05 06:57:33 +0000 |
| commit | 003e0bb8ff3fcb4dbc74e1e199eb3fd2454166be (patch) | |
| tree | d79a2e2f2e477cfbe06d65510782675fdf198951 /cmake | |
| parent | b64e8e721fd9117af585151b93a18fec1c285059 (diff) | |
cmake: tweak largefile defines
so they are actually set for all the targets
and that the code is a bit simpler
Change-Id: I2cd253d0a3cec3f482b868f81e852edfa158d3f1
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 07ea801887..bd18d48beb 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -1051,10 +1051,6 @@ function(add_qt_module target) qt_autogen_tools_initial_setup(${target}) - if(FEATURE_largefile) - set(largefile_defines "_LARGEFILE64_SOURCE;_LARGEFILE_SOURCE") - endif() - extend_target("${target}" SOURCES ${arg_SOURCES} PUBLIC_INCLUDE_DIRECTORIES @@ -1079,7 +1075,6 @@ function(add_qt_module target) QT_USE_QSTRINGBUILDER QT_DEPRECATED_WARNINGS QT_BUILDING_QT - "${largefile_defines}" QT_BUILD_${module_upper}_LIB ### FIXME: use QT_BUILD_ADDON for Add-ons or remove if we don't have add-ons anymore "${deprecation_define}" PUBLIC_LIBRARIES ${arg_PUBLIC_LIBRARIES} @@ -1103,6 +1098,9 @@ function(add_qt_module target) # It's set for every module being built, but it's not propagated to user apps. target_compile_definitions("${target}" PRIVATE _USE_MATH_DEFINES) endif() + if(FEATURE_largefile) + target_compile_definitions("${target}" PRIVATE "_LARGEFILE64_SOURCE;_LARGEFILE_SOURCE") + endif() set(configureFile "${CMAKE_CURRENT_SOURCE_DIR}/configure.cmake") if(EXISTS "${configureFile}") @@ -1439,6 +1437,10 @@ function(add_qt_plugin target) ENABLE_AUTOGEN_TOOLS ${arg_ENABLE_AUTOGEN_TOOLS} DISABLE_AUTOGEN_TOOLS ${arg_DISABLE_AUTOGEN_TOOLS} ) + if(FEATURE_largefile) + target_compile_definitions("${target}" PRIVATE "_LARGEFILE64_SOURCE;_LARGEFILE_SOURCE") + endif() + set(qt_libs_private "") foreach(it ${QT_KNOWN_MODULES}) @@ -1549,6 +1551,10 @@ function(add_qt_executable name) WIN32_EXECUTABLE "${arg_GUI}" MACOSX_BUNDLE "${arg_GUI}" ) + if(FEATURE_largefile) + target_compile_definitions("${name}" PRIVATE "_LARGEFILE64_SOURCE;_LARGEFILE_SOURCE") + endif() + if(WIN32) # Workaround for not having ported the winmain / qtmain static library |