Merge branch 'develop' into feature/sparkle-mac
# Conflicts: # .github/workflows/build.yml
This commit is contained in:
commit
b3b76d5d56
374 changed files with 12410 additions and 6477 deletions
|
@ -7,5 +7,5 @@ add_library(BuildConfig STATIC
|
|||
${CMAKE_CURRENT_BINARY_DIR}/BuildConfig.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(BuildConfig Qt5::Core)
|
||||
target_link_libraries(BuildConfig Qt${QT_VERSION_MAJOR}::Core)
|
||||
target_include_directories(BuildConfig PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue