diff --git a/CMakeLists.txt b/CMakeLists.txt index cc10718..2e57e3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,10 @@ if (UNIX AND NOT APPLE AND CMAKE_COMPILER_IS_GNUCXX) set(LINUX_GCC ON) endif() +if (LINUX_GCC) + find_package(TBB REQUIRED) +endif() + add_subdirectory(Pdf4QtLib) add_subdirectory(CodeGenerator) add_subdirectory(JBIG2_Viewer) diff --git a/Pdf4QtLib/CMakeLists.txt b/Pdf4QtLib/CMakeLists.txt index 399deb8..d92f1fe 100644 --- a/Pdf4QtLib/CMakeLists.txt +++ b/Pdf4QtLib/CMakeLists.txt @@ -119,7 +119,7 @@ target_link_libraries(Pdf4QtLib PRIVATE openjp2) target_link_libraries(Pdf4QtLib PRIVATE JPEG::JPEG) if(LINUX_GCC) - target_link_libraries(Pdf4QtLib PRIVATE tbb) + target_link_libraries(Pdf4QtLib PUBLIC TBB::tbb) endif() if(MINGW) diff --git a/Pdf4QtViewerLite/CMakeLists.txt b/Pdf4QtViewerLite/CMakeLists.txt index c068974..da36dbc 100644 --- a/Pdf4QtViewerLite/CMakeLists.txt +++ b/Pdf4QtViewerLite/CMakeLists.txt @@ -22,10 +22,6 @@ add_executable(Pdf4QtViewerLite target_link_libraries(Pdf4QtViewerLite PRIVATE Pdf4QtLib Pdf4QtViewer Qt6::Core Qt6::Gui Qt6::Widgets) -if(LINUX_GCC) - target_link_libraries(Pdf4QtViewerLite PRIVATE tbb) -endif() - set_target_properties(Pdf4QtViewerLite PROPERTIES WIN32_EXECUTABLE ON MACOSX_BUNDLE ON diff --git a/Pdf4QtViewerProfi/CMakeLists.txt b/Pdf4QtViewerProfi/CMakeLists.txt index 0f357f3..0e7ca0e 100644 --- a/Pdf4QtViewerProfi/CMakeLists.txt +++ b/Pdf4QtViewerProfi/CMakeLists.txt @@ -22,10 +22,6 @@ add_executable(Pdf4QtViewerProfi target_link_libraries(Pdf4QtViewerProfi PRIVATE Pdf4QtLib Pdf4QtViewer Qt6::Core Qt6::Gui Qt6::Widgets) -if(LINUX_GCC) - target_link_libraries(Pdf4QtViewerProfi PRIVATE tbb) -endif() - set_target_properties(Pdf4QtViewerProfi PROPERTIES WIN32_EXECUTABLE ON MACOSX_BUNDLE ON diff --git a/PdfTool/CMakeLists.txt b/PdfTool/CMakeLists.txt index 1d0d1da..0a3ef59 100644 --- a/PdfTool/CMakeLists.txt +++ b/PdfTool/CMakeLists.txt @@ -52,8 +52,4 @@ if(MINGW) target_link_libraries(PdfTool PRIVATE ole32 sapi) endif() -if(LINUX_GCC) - target_link_libraries(PdfTool PRIVATE tbb) -endif() - install(TARGETS PdfTool) diff --git a/vcpkg.json b/vcpkg.json index a1fcbff..04c7987 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,5 +1,5 @@ { "name": "pdf4qt", - "version-string": "1.3.3", - "dependencies": [ "openssl", "lcms", "zlib", "openjpeg", "freetype", "ijg-libjpeg", "libpng" ] + "version-string": "1.3.4", + "dependencies": [ "tbb", "openssl", "lcms", "zlib", "openjpeg", "freetype", "ijg-libjpeg", "libpng" ] }