fenix
/
PDF4QT
mirror of https://github.com/JakubMelka/PDF4QT.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tbb library included in vcpkg

This commit is contained in:
Jakub Melka 2023-09-08 16:08:07 +02:00
parent 278d385968
commit 17abb360ed
6 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -72,6 +72,10 @@ if (UNIX AND NOT APPLE AND CMAKE_COMPILER_IS_GNUCXX)
set(LINUX_GCC ON) set(LINUX_GCC ON)
endif() endif()
if (LINUX_GCC)
find_package(TBB REQUIRED)
endif()
add_subdirectory(Pdf4QtLib) add_subdirectory(Pdf4QtLib)
add_subdirectory(CodeGenerator) add_subdirectory(CodeGenerator)
add_subdirectory(JBIG2_Viewer) add_subdirectory(JBIG2_Viewer)

2
Pdf4QtLib/CMakeLists.txt
View File

@ -119,7 +119,7 @@ target_link_libraries(Pdf4QtLib PRIVATE openjp2)
target_link_libraries(Pdf4QtLib PRIVATE JPEG::JPEG) target_link_libraries(Pdf4QtLib PRIVATE JPEG::JPEG)
if(LINUX_GCC) if(LINUX_GCC)
target_link_libraries(Pdf4QtLib PRIVATE tbb) target_link_libraries(Pdf4QtLib PUBLIC TBB::tbb)
endif() endif()
if(MINGW) if(MINGW)

4
Pdf4QtViewerLite/CMakeLists.txt
View File

@ -22,10 +22,6 @@ add_executable(Pdf4QtViewerLite
target_link_libraries(Pdf4QtViewerLite PRIVATE Pdf4QtLib Pdf4QtViewer Qt6::Core Qt6::Gui Qt6::Widgets) 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 set_target_properties(Pdf4QtViewerLite PROPERTIES
WIN32_EXECUTABLE ON WIN32_EXECUTABLE ON
MACOSX_BUNDLE ON MACOSX_BUNDLE ON

4
Pdf4QtViewerProfi/CMakeLists.txt
View File

@ -22,10 +22,6 @@ add_executable(Pdf4QtViewerProfi
target_link_libraries(Pdf4QtViewerProfi PRIVATE Pdf4QtLib Pdf4QtViewer Qt6::Core Qt6::Gui Qt6::Widgets) 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 set_target_properties(Pdf4QtViewerProfi PROPERTIES
WIN32_EXECUTABLE ON WIN32_EXECUTABLE ON
MACOSX_BUNDLE ON MACOSX_BUNDLE ON

4
PdfTool/CMakeLists.txt
View File

@ -52,8 +52,4 @@ if(MINGW)
target_link_libraries(PdfTool PRIVATE ole32 sapi) target_link_libraries(PdfTool PRIVATE ole32 sapi)
endif() endif()
if(LINUX_GCC)
target_link_libraries(PdfTool PRIVATE tbb)
endif()
install(TARGETS PdfTool) install(TARGETS PdfTool)

4
vcpkg.json
View File

@ -1,5 +1,5 @@
{ {
"name": "pdf4qt", "name": "pdf4qt",
"version-string": "1.3.3", "version-string": "1.3.4",
"dependencies": [ "openssl", "lcms", "zlib", "openjpeg", "freetype", "ijg-libjpeg", "libpng" ] "dependencies": [ "tbb", "openssl", "lcms", "zlib", "openjpeg", "freetype", "ijg-libjpeg", "libpng" ]
} }