kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Minimize amount of code to rebuild when switching options

Browse source
This commit is contained in:
Ilya Fedin 2023-09-22 04:18:47 +04:00 • committed by John Preston
parent 18d4aae269
commit 0ae4e78a12
5 changed files with 18 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
external/qt/qt_static_plugins/CMakeLists.txt vendored
View file

@ -19,6 +19,13 @@ PUBLIC
desktop-app::external_kimageformats desktop-app::external_kimageformats
) )
if (DESKTOP_APP_USE_PACKAGED)
target_compile_definitions(external_qt_static_plugins
PRIVATE
QT_STATIC_PLUGINS_USE_PACKAGED
)
endif()
if (LINUX) if (LINUX)
target_link_libraries(external_qt_static_plugins target_link_libraries(external_qt_static_plugins
PUBLIC PUBLIC

4
external/qt/qt_static_plugins/qt_static_plugins.cpp vendored
View file

@ -7,10 +7,10 @@ https://github.com/desktop-app/legal/blob/master/LEGAL
*/ */
#include <QtCore/QtPlugin> #include <QtCore/QtPlugin>
#if !defined DESKTOP_APP_USE_PACKAGED && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && defined Q_OS_WIN #if !defined QT_STATIC_PLUGINS_USE_PACKAGED && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && defined Q_OS_WIN
Q_IMPORT_PLUGIN(QGenericEnginePlugin) Q_IMPORT_PLUGIN(QGenericEnginePlugin)
Q_IMPORT_PLUGIN(QWebpPlugin) Q_IMPORT_PLUGIN(QWebpPlugin)
Q_IMPORT_PLUGIN(QJpegPlugin) Q_IMPORT_PLUGIN(QJpegPlugin)
Q_IMPORT_PLUGIN(QGifPlugin) Q_IMPORT_PLUGIN(QGifPlugin)
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
#endif // !DESKTOP_APP_USE_PACKAGED && Qt < 6.0.0 && Q_OS_WIN #endif // !QT_STATIC_PLUGINS_USE_PACKAGED && Qt < 6.0.0 && Q_OS_WIN

49
options.cmake
View file

@ -16,13 +16,6 @@ INTERFACE
QT_DEPRECATED_WARNINGS_SINCE=0x051500 QT_DEPRECATED_WARNINGS_SINCE=0x051500
) )
if (DESKTOP_APP_DISABLE_CRASH_REPORTS)
target_compile_definitions(common_options
INTERFACE
DESKTOP_APP_DISABLE_CRASH_REPORTS
)
endif()
if (DESKTOP_APP_DISABLE_X11_INTEGRATION) if (DESKTOP_APP_DISABLE_X11_INTEGRATION)
target_compile_definitions(common_options target_compile_definitions(common_options
INTERFACE INTERFACE
@ -30,48 +23,6 @@ if (DESKTOP_APP_DISABLE_X11_INTEGRATION)
) )
endif() endif()
if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_compile_definitions(common_options
INTERFACE
DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
)
endif()
if (DESKTOP_APP_USE_PACKAGED)
target_compile_definitions(common_options
INTERFACE
DESKTOP_APP_USE_PACKAGED
)
endif()
if (DESKTOP_APP_USE_PACKAGED_LAZY)
target_compile_definitions(common_options
INTERFACE
DESKTOP_APP_USE_PACKAGED_LAZY
)
endif()
if (DESKTOP_APP_USE_PACKAGED_FONTS)
target_compile_definitions(common_options
INTERFACE
DESKTOP_APP_USE_PACKAGED_FONTS
)
endif()
if (DESKTOP_APP_USE_PACKAGED_RLOTTIE)
target_compile_definitions(common_options
INTERFACE
DESKTOP_APP_USE_PACKAGED_RLOTTIE
)
endif()
if (NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "")
target_compile_definitions(common_options
INTERFACE
DESKTOP_APP_SPECIAL_TARGET=${DESKTOP_APP_SPECIAL_TARGET}
)
endif()
if (WIN32) if (WIN32)
include(cmake/options_win.cmake) include(cmake/options_win.cmake)
elseif (APPLE) elseif (APPLE)

7
win_directx_helper/CMakeLists.txt
View file

@ -19,3 +19,10 @@ target_link_libraries(win_directx_helper
PUBLIC PUBLIC
desktop-app::external_openssl desktop-app::external_openssl
) )
if (NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "")
target_compile_definitions(win_directx_helper
PRIVATE
WIN_DIRECTX_HELPER_SPECIAL_TARGET=${DESKTOP_APP_SPECIAL_TARGET}
)
endif()

4
win_directx_helper/win_directx_helper.cpp
View file

@ -173,9 +173,9 @@ bool ResolveD3DCompiler() {
if (FileSha256(path) == hash && ResolveD3DCompiler(path)) { if (FileSha256(path) == hash && ResolveD3DCompiler(path)) {
return true; return true;
} }
#elif defined DESKTOP_APP_SPECIAL_TARGET // DESKTOP_APP_D3DCOMPILER_HASH #elif defined WIN_DIRECTX_HELPER_SPECIAL_TARGET // DESKTOP_APP_D3DCOMPILER_HASH
#error "Special target build should have d3dcompiler hash." #error "Special target build should have d3dcompiler hash."
#endif // !DESKTOP_APP_D3DCOMPILER_HASH && DESKTOP_APP_SPECIAL_TARGET #endif // !DESKTOP_APP_D3DCOMPILER_HASH && WIN_DIRECTX_HELPER_SPECIAL_TARGET
return ResolveD3DCompiler(L"d3dcompiler_47.dll"); return ResolveD3DCompiler(L"d3dcompiler_47.dll");
}(); }();