1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid generating private cpp exports

Browse Source 
Ignore GENERATE_PRIVATE_CPP_EXPORTS argument of qt_internal_add_module.

Task-number: QTBUG-117983
Change-Id: I03a443cb575628f3225b944316507a033d262894
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexey Edelev 2023-11-23 12:13:02 +01:00
parent 5761dd55c8
commit bd31014031
3 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/QtBuildHelpers.cmake
View File

@ -235,7 +235,6 @@ function(qt_internal_get_qt_build_private_files_to_install out_var)
QtStandaloneTestsConfig.cmake.in QtStandaloneTestsConfig.cmake.in
QtWriteArgsFile.cmake QtWriteArgsFile.cmake
modulecppexports.h.in modulecppexports.h.in
modulecppexports_p.h.in
qbatchedtestrunner.in.cpp qbatchedtestrunner.in.cpp
PARENT_SCOPE PARENT_SCOPE
) )

20
cmake/QtModuleHelpers.cmake
View File

@ -429,12 +429,8 @@ function(qt_internal_add_module target)
"CPP_EXPORT_HEADER_BASE_NAME;${arg_CPP_EXPORT_HEADER_BASE_NAME}" "CPP_EXPORT_HEADER_BASE_NAME;${arg_CPP_EXPORT_HEADER_BASE_NAME}"
) )
endif() endif()
if(arg_GENERATE_PRIVATE_CPP_EXPORTS)
set(generate_private_cpp_export "GENERATE_PRIVATE_CPP_EXPORTS")
endif()
qt_internal_generate_cpp_global_exports(${target} ${module_define_infix} qt_internal_generate_cpp_global_exports(${target} ${module_define_infix}
"${cpp_export_header_base_name}" "${cpp_export_header_base_name}"
"${generate_private_cpp_export}"
) )
endif() endif()
@ -1165,7 +1161,7 @@ endfunction()
function(qt_internal_generate_cpp_global_exports target module_define_infix) function(qt_internal_generate_cpp_global_exports target module_define_infix)
cmake_parse_arguments(arg cmake_parse_arguments(arg
"GENERATE_PRIVATE_CPP_EXPORTS" ""
"CPP_EXPORT_HEADER_BASE_NAME" "CPP_EXPORT_HEADER_BASE_NAME"
"" ${ARGN} "" ${ARGN}
) )
@ -1190,20 +1186,6 @@ function(qt_internal_generate_cpp_global_exports target module_define_infix)
set(${out_public_header} "${generated_header_path}" PARENT_SCOPE) set(${out_public_header} "${generated_header_path}" PARENT_SCOPE)
target_sources(${target} PRIVATE "${generated_header_path}") target_sources(${target} PRIVATE "${generated_header_path}")
set_source_files_properties("${generated_header_path}" PROPERTIES GENERATED TRUE) set_source_files_properties("${generated_header_path}" PROPERTIES GENERATED TRUE)
if(arg_GENERATE_PRIVATE_CPP_EXPORTS)
set(generated_private_header_path
"${module_build_interface_private_include_dir}/${header_base_name}_p.h"
)
configure_file("${QT_CMAKE_DIR}/modulecppexports_p.h.in"
"${generated_private_header_path}" @ONLY
)
set(${out_private_header} "${generated_private_header_path}" PARENT_SCOPE)
target_sources(${target} PRIVATE "${generated_private_header_path}")
set_source_files_properties("${generated_private_header_path}" PROPERTIES GENERATED TRUE)
endif()
endfunction() endfunction()
function(qt_internal_install_module_headers target) function(qt_internal_install_module_headers target)

24
cmake/modulecppexports_p.h.in
View File

@ -1,24 +0,0 @@
// Copyright (C) 2021 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#ifndef @header_base_name_upper@_P_H
#define @header_base_name_upper@_P_H
// This file is autogenerated. Changes will be overwritten.
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists purely as an
// implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
//
#include <@module_include_name@/@header_base_name@.h>
#define Q_@module_define_infix@_PRIVATE_EXPORT Q_@module_define_infix@_EXPORT
#endif // @header_base_name_upper@_P_H