"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "scribus/CMakeLists.txt" between
scribus-1.5.6.tar.xz and scribus-1.5.6.1.tar.xz

About: Scribus is a Linux desktop publishing program. Unstable version.

CMakeLists.txt  (scribus-1.5.6.tar.xz):CMakeLists.txt  (scribus-1.5.6.1.tar.xz)
skipping to change at line 32 skipping to change at line 32
endif() endif()
include_directories( include_directories(
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${FREETYPE_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS}
${HARFBUZZ_INCLUDE_DIRS} ${HARFBUZZ_INCLUDE_DIRS}
) )
include(text/CMakeLists.txt)
add_subdirectory(dtd) add_subdirectory(dtd)
add_subdirectory(colormgmt) add_subdirectory(colormgmt)
add_subdirectory(desaxe) add_subdirectory(desaxe)
add_subdirectory(fonts) add_subdirectory(fonts)
add_subdirectory(styles) add_subdirectory(styles)
add_subdirectory(text)
add_subdirectory(ui/qml) add_subdirectory(ui/qml)
if(WITH_TESTS) if(WITH_TESTS)
add_subdirectory(tests) add_subdirectory(tests)
endif() endif()
if (WANT_DESIGNER) if (WANT_DESIGNER)
add_subdirectory(designer) add_subdirectory(designer)
endif () endif ()
add_subdirectory(third_party) add_subdirectory(third_party)
if(HAVE_OSG) if(HAVE_OSG)
skipping to change at line 583 skipping to change at line 584
ui/filetoolbar.h ui/filetoolbar.h
ui/modetoolbar.h ui/modetoolbar.h
ui/pdftoolbar.h ui/pdftoolbar.h
ui/viewtoolbar.h ui/viewtoolbar.h
ui/unicodesearch.h ui/unicodesearch.h
ui/useprintermarginsdialog.h ui/useprintermarginsdialog.h
ui/vruler.h ui/vruler.h
ui/weldedit.h ui/weldedit.h
# #{SCRIBUS_ITEMSETTERS_CLASS} # #{SCRIBUS_ITEMSETTERS_CLASS}
${SCRIBUS_OSG_CLASS} ${SCRIBUS_OSG_CLASS}
${SCRIBUS_TEXT_MOC_CLASSES}
) )
set(SCRIBUS_SOURCES set(SCRIBUS_SOURCES
actionmanager.cpp actionmanager.cpp
actionsearch.cpp actionsearch.cpp
appmodehelper.cpp appmodehelper.cpp
canvas.cpp canvas.cpp
canvasgesture_cellselect.cpp canvasgesture_cellselect.cpp
canvasgesture_columnresize.cpp canvasgesture_columnresize.cpp
canvasgesture_linemove.cpp canvasgesture_linemove.cpp
skipping to change at line 1099 skipping to change at line 1101
ui/modetoolbar.cpp ui/modetoolbar.cpp
ui/pdftoolbar.cpp ui/pdftoolbar.cpp
ui/viewtoolbar.cpp ui/viewtoolbar.cpp
ui/unicodesearch.cpp ui/unicodesearch.cpp
ui/vruler.cpp ui/vruler.cpp
ui/useprintermarginsdialog.cpp ui/useprintermarginsdialog.cpp
ui/weldedit.cpp ui/weldedit.cpp
# #{SCRIBUS_ITEMSETTERS_SRC} # #{SCRIBUS_ITEMSETTERS_SRC}
${SCRIBUS_OSG_SRC} ${SCRIBUS_OSG_SRC}
${SCRIBUS_GMAGICK_SRC} ${SCRIBUS_GMAGICK_SRC}
${SCRIBUS_TEXT_LIB_SOURCES}
) )
if(NOT HAVE_HYPHEN) if(NOT HAVE_HYPHEN)
include_directories(third_party/hyphen) include_directories(third_party/hyphen)
set(SCRIBUS_SOURCES set(SCRIBUS_SOURCES
${SCRIBUS_SOURCES} ${SCRIBUS_SOURCES}
third_party/hyphen/hnjalloc.c third_party/hyphen/hnjalloc.c
third_party/hyphen/hyphen.c third_party/hyphen/hyphen.c
) )
endif() endif()
skipping to change at line 1136 skipping to change at line 1139
QT5_WRAP_CPP(SCRIBUS_MOC_SOURCES QT5_WRAP_CPP(SCRIBUS_MOC_SOURCES
${SCRIBUS_MOC_CLASSES} ${SCRIBUS_MOC_CLASSES}
${SCRIBUS_MOC_WIN32_ONLY_CLASSES} ${SCRIBUS_MOC_WIN32_ONLY_CLASSES}
) )
link_directories( link_directories(
${CMAKE_CURRENT_BINARY_DIR}/colormgmt ${CMAKE_CURRENT_BINARY_DIR}/colormgmt
${CMAKE_CURRENT_BINARY_DIR}/desaxe ${CMAKE_CURRENT_BINARY_DIR}/desaxe
${CMAKE_CURRENT_BINARY_DIR}/fonts ${CMAKE_CURRENT_BINARY_DIR}/fonts
${CMAKE_CURRENT_BINARY_DIR}/styles ${CMAKE_CURRENT_BINARY_DIR}/styles
${CMAKE_CURRENT_BINARY_DIR}/text
${CMAKE_CURRENT_BINARY_DIR}/third_party/wpg ${CMAKE_CURRENT_BINARY_DIR}/third_party/wpg
${CMAKE_CURRENT_BINARY_DIR}/third_party/pgf ${CMAKE_CURRENT_BINARY_DIR}/third_party/pgf
${CMAKE_CURRENT_BINARY_DIR}/third_party/rtf-qt ${CMAKE_CURRENT_BINARY_DIR}/third_party/rtf-qt
${CMAKE_CURRENT_BINARY_DIR}/third_party/zip ${CMAKE_CURRENT_BINARY_DIR}/third_party/zip
${HARFBUZZ_LIBRARY_DIRS} ${HARFBUZZ_LIBRARY_DIRS}
${ICU_LIBRARY_DIRS} ${ICU_LIBRARY_DIRS}
) )
if(WITH_TESTS) if(WITH_TESTS)
link_directories( ${CMAKE_CURRENT_BINARY_DIR}/tests ) link_directories( ${CMAKE_CURRENT_BINARY_DIR}/tests )
skipping to change at line 1158 skipping to change at line 1160
if(HAVE_OSG) if(HAVE_OSG)
link_directories( ${CMAKE_CURRENT_BINARY_DIR}/third_party/prc ) link_directories( ${CMAKE_CURRENT_BINARY_DIR}/third_party/prc )
endif () endif ()
if(HAVE_BOOST) if(HAVE_BOOST)
link_directories( ${CMAKE_CURRENT_BINARY_DIR}/third_party/lib2geom ) link_directories( ${CMAKE_CURRENT_BINARY_DIR}/third_party/lib2geom )
endif () endif ()
set(SCRIBUS_COLORMGMT_LIB "scribus_colormgmt_lib") set(SCRIBUS_COLORMGMT_LIB "scribus_colormgmt_lib")
set(SCRIBUS_TEXT_LIB "scribus_text_lib")
if(WITH_TESTS) if(WITH_TESTS)
set(SCRIBUS_TESTS_LIB "scribus_tests_lib") set(SCRIBUS_TESTS_LIB "scribus_tests_lib")
else() else()
set(SCRIBUS_TESTS_LIB "") set(SCRIBUS_TESTS_LIB "")
endif() endif()
set(SCRIBUS_STYLES_LIB "scribus_styles_lib") set(SCRIBUS_STYLES_LIB "scribus_styles_lib")
set(SCRIBUS_FONTS_LIB "scribus_fonts_lib") set(SCRIBUS_FONTS_LIB "scribus_fonts_lib")
set(SCRIBUS_DESAXE_LIB "scribus_desaxe_lib") set(SCRIBUS_DESAXE_LIB "scribus_desaxe_lib")
if(HAVE_OSG) if(HAVE_OSG)
set(SCRIBUS_PRC_LIB "scribus_prc_lib") set(SCRIBUS_PRC_LIB "scribus_prc_lib")
skipping to change at line 1231 skipping to change at line 1233
if(COMMAND cmake_policy) if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 OLD) cmake_policy(SET CMP0003 OLD)
endif() endif()
if(HAVE_OSG) if(HAVE_OSG)
add_executable(${EXE_NAME} add_executable(${EXE_NAME}
${SCRIBUS_MOC_SOURCES} ${SCRIBUS_MOC_SOURCES}
${SCRIBUS_SOURCES} ${SCRIBUS_SOURCES}
${SCRIBUS_MAIN_CPP} ${SCRIBUS_MAIN_CPP}
${SCRIBUS_UI_SOURCES} ${SCRIBUS_UI_SOURCES}
${SCRIBUS_TEXT_SOURCES}
${SCRIBUS_STYLES_SOURCES} ${SCRIBUS_STYLES_SOURCES}
${SCRIBUS_COLORMGMT_SOURCES} ${SCRIBUS_COLORMGMT_SOURCES}
${SCRIBUS_FONTS_SOURCES} ${SCRIBUS_FONTS_SOURCES}
${SCRIBUS_DESAXE_SOURCES} ${SCRIBUS_DESAXE_SOURCES}
${SCRIBUS_WIN32_ONLY_SOURCES} ${SCRIBUS_WIN32_ONLY_SOURCES}
${GESTURE_FRAME_PREVIEW_SOURCES} ${GESTURE_FRAME_PREVIEW_SOURCES}
${SCRIBUS_PRC_SOURCES} ${SCRIBUS_PRC_SOURCES}
) )
else() else()
add_executable(${EXE_NAME} add_executable(${EXE_NAME}
${SCRIBUS_MOC_SOURCES} ${SCRIBUS_MOC_SOURCES}
${SCRIBUS_SOURCES} ${SCRIBUS_SOURCES}
${SCRIBUS_MAIN_CPP} ${SCRIBUS_MAIN_CPP}
${SCRIBUS_UI_SOURCES} ${SCRIBUS_UI_SOURCES}
${SCRIBUS_TEXT_SOURCES}
${SCRIBUS_STYLES_SOURCES} ${SCRIBUS_STYLES_SOURCES}
${SCRIBUS_COLORMGMT_SOURCES} ${SCRIBUS_COLORMGMT_SOURCES}
${SCRIBUS_FONTS_SOURCES} ${SCRIBUS_FONTS_SOURCES}
${SCRIBUS_DESAXE_SOURCES} ${SCRIBUS_DESAXE_SOURCES}
${SCRIBUS_WIN32_ONLY_SOURCES} ${SCRIBUS_WIN32_ONLY_SOURCES}
${GESTURE_FRAME_PREVIEW_SOURCES} ${GESTURE_FRAME_PREVIEW_SOURCES}
) )
endif () endif ()
if(WIN32) if(WIN32)
skipping to change at line 1359 skipping to change at line 1359
"-framework CoreFoundation" ) "-framework CoreFoundation" )
endif() endif()
if (WANT_SVNVERSION) if (WANT_SVNVERSION)
add_dependencies(${EXE_NAME} svnheader) add_dependencies(${EXE_NAME} svnheader)
endif () endif ()
target_link_libraries(${EXE_NAME} target_link_libraries(${EXE_NAME}
${SCRIBUS_COLORMGMT_LIB} ${SCRIBUS_COLORMGMT_LIB}
${SCRIBUS_DESAXE_LIB} ${SCRIBUS_DESAXE_LIB}
${SCRIBUS_TEXT_LIB}
${SCRIBUS_STYLES_LIB} ${SCRIBUS_STYLES_LIB}
${SCRIBUS_FONTS_LIB} ${SCRIBUS_FONTS_LIB}
${SCRIBUS_WPG_LIB} ${SCRIBUS_WPG_LIB}
${SCRIBUS_PGF_LIB} ${SCRIBUS_PGF_LIB}
${SCRIBUS_ZIP_LIB} ${SCRIBUS_ZIP_LIB}
${SCRIBUS_RTF_LIB} ${SCRIBUS_RTF_LIB}
${LCMS2_LIBRARIES} ${LCMS2_LIBRARIES}
) )
if(WITH_TESTS) if(WITH_TESTS)
 End of changes. 9 change blocks. 
6 lines changed or deleted 5 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)