dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compile with translations on Windows

Browse Source
This commit is contained in:
Jonas Kvinge
2020-01-03 02:07:37 +01:00
parent e912c59402
commit 31aa42c2fa
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -107,10 +107,6 @@ pkg_check_modules(LIBPLIST libplist)
find_package(Gettext) find_package(Gettext)
find_package(FFTW3) find_package(FFTW3)
if(WIN32)
find_package(ZLIB REQUIRED)
endif(WIN32)
# QT # QT
set(QT_MIN_VERSION 5.5) set(QT_MIN_VERSION 5.5)
set(QT_COMPONENTS Core Concurrent Widgets Network Sql) set(QT_COMPONENTS Core Concurrent Widgets Network Sql)
@@ -128,7 +124,7 @@ if(WIN32)
list(APPEND QT_COMPONENTS WinExtras) list(APPEND QT_COMPONENTS WinExtras)
endif() endif()
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED ${QT_COMPONENTS}) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS})
set(QT_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Concurrent_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} ${Qt5Sql_LIBRARIES}) set(QT_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Concurrent_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} ${Qt5Sql_LIBRARIES})
@@ -146,7 +142,7 @@ if(Qt5WinExtras_FOUND)
list(APPEND QT_LIBRARIES ${Qt5WinExtras_LIBRARIES}) list(APPEND QT_LIBRARIES ${Qt5WinExtras_LIBRARIES})
endif() endif()
find_package(Qt5LinguistTools CONFIG) find_package(Qt5 ${QT_MIN_VERSION} QUIET COMPONENTS LinguistTools CONFIG)
if (Qt5LinguistTools_FOUND) if (Qt5LinguistTools_FOUND)
set(QT_LCONVERT_EXECUTABLE Qt5::lconvert) set(QT_LCONVERT_EXECUTABLE Qt5::lconvert)
endif() endif()

5
src/CMakeLists.txt
View File

@@ -1137,10 +1137,7 @@ if (APPLE)
endif (APPLE) endif (APPLE)
if (WIN32) if (WIN32)
target_link_libraries(strawberry_lib target_link_libraries(strawberry_lib dsound)
${ZLIB_LIBRARIES}
dsound
)
endif (WIN32) endif (WIN32)
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE)