Skip to content

Commit

Permalink
Include changes to support Qt Advanced Docking System for Indigo UI, …
Browse files Browse the repository at this point in the history
…specify -DWANT_QTADS in CMake

git-svn-id: svn://scribus.net/trunk/Scribus@25397 11d20701-8431-0410-a711-e3c959e3b870
  • Loading branch information
Craig Bradney committed Mar 30, 2023
1 parent 3f0ee27 commit 99a8a05
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CMakeLists_Dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ if (WANT_GRAPHICSMAGICK)
message(" GraphicsMagick NOT found! Building without additional image format support!")
endif()
else()
message("Building without GraphicsMagick (use -DWANT_GRAPHICSMAGICK=1 to enable)")
message("Building without GraphicsMagick (use -DWANT_GRAPHICSMAGICK=1 to enable)")
endif()
#>> GraphicsMagick for image import

Expand Down
10 changes: 10 additions & 0 deletions scribus/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ set(CMAKE_AUTOUIC_SEARCH_PATHS ui/)
set_property(SOURCE third_party/fparser/file.hh PROPERTY SKIP_AUTOGEN ON)
set_property(SOURCE third_party/fparser/fparser.hh PROPERTY SKIP_AUTOGEN ON)

if(WANT_QTADS)
MESSAGE(STATUS "Qt Advanced Docking System included")
link_directories(${CMAKE_CURRENT_BINARY_DIR}/third_party/Qt-Advanced-Docking-System)
endif()

link_directories(
${CMAKE_CURRENT_BINARY_DIR}/third_party/wpg
${CMAKE_CURRENT_BINARY_DIR}/third_party/pgf
Expand Down Expand Up @@ -270,13 +275,18 @@ if (WANT_SVNVERSION)
add_dependencies(${EXE_NAME} svnheader)
endif ()


target_link_libraries(${EXE_NAME} PRIVATE
${SCRIBUS_WPG_LIB}
${SCRIBUS_PGF_LIB}
${SCRIBUS_ZIP_LIB}
${SCRIBUS_RTF_LIB}
)

if(WANT_QTADS)
target_link_libraries(${EXE_NAME} PRIVATE qt6advanceddocking)
endif()

if(WITH_TESTS)
target_link_libraries(${EXE_NAME} PRIVATE
${QT_QTTEST_LIBRARY}
Expand Down

0 comments on commit 99a8a05

Please sign in to comment.