| 1 | diff --git a/CMakeLists.txt b/CMakeLists.txt
|
| 2 | index 4b8fe0d..5b93a59 100644
|
| 3 | |
| 4 | |
| 5 | @@ -76,9 +76,8 @@ else()
|
| 6 | endif()
|
| 7 |
|
| 8 | find_package(ZLIB REQUIRED)
|
| 9 | -# find_package(Intl REQUIRED)
|
| 10 | -find_package(QUAZIP REQUIRED)
|
| 11 | -# find_package(QuaZip-Qt5 REQUIRED)
|
| 12 | +find_package(Intl REQUIRED)
|
| 13 | +pkg_check_modules(QUAZIP REQUIRED IMPORTED_TARGET quazip1-qt6)
|
| 14 | if(${QT_MAJOR} EQUAL 5)
|
| 15 | pkg_check_modules(POPPLER_QT5 REQUIRED poppler-qt5)
|
| 16 | elseif(${QT_MAJOR} EQUAL 6)
|
| 17 | @@ -158,17 +157,13 @@ add_executable(sturmreader
|
| 18 | ui/resources.qrc
|
| 19 | ${QML_COMPILED_RES})
|
| 20 |
|
| 21 | -#target_include_directories(sturmreader SYSTEM PRIVATE QuaZip::QuaZip)
|
| 22 | -target_include_directories(sturmreader SYSTEM PRIVATE ${QUAZIP_INCLUDE_DIR})
|
| 23 | -
|
| 24 |
|
| 25 | add_dependencies(sturmreader qtrar qtrarobjs)
|
| 26 | if(${QT_MAJOR} EQUAL 5)
|
| 27 | target_link_libraries(sturmreader
|
| 28 | poppler-qt5
|
| 29 | ${Intl_LIBRARIES}
|
| 30 | - #QuaZip::QuaZip
|
| 31 | - ${QUAZIP_LIBRARIES}
|
| 32 | + PkgConfig::QUAZIP
|
| 33 | qtrar qtrarobjs
|
| 34 | #qtrarlib qtrarobjslib
|
| 35 | pthread
|
| 36 | @@ -178,7 +173,7 @@ elseif(${QT_MAJOR} EQUAL 6)
|
| 37 | target_link_libraries(sturmreader
|
| 38 | poppler-qt6
|
| 39 | ${Intl_LIBRARIES}
|
| 40 | - ${QUAZIP_LIBRARIES}
|
| 41 | + PkgConfig::QUAZIP
|
| 42 | qtrar qtrarobjs
|
| 43 | # qtrarlib qtrarobjslib
|
| 44 | pthread
|