r24260 by jghali - Give same treatment to colormgmt, desaxe, fonts and styles directories than text directory
scribus-commit
scribus-commit at lists.scribus.net
Mon Nov 16 23:55:17 UTC 2020
Author: jghali
Date: Mon Nov 16 23:55:16 2020
New Revision: 24260
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24260
Log:
Give same treatment to colormgmt, desaxe, fonts and styles directories than text directory
Modified:
trunk/Scribus/scribus/CMakeLists.txt
trunk/Scribus/scribus/colormgmt/CMakeLists.txt
trunk/Scribus/scribus/desaxe/CMakeLists.txt
trunk/Scribus/scribus/fonts/CMakeLists.txt
trunk/Scribus/scribus/styles/CMakeLists.txt
trunk/Scribus/scribus/text/CMakeLists.txt
Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24260&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Mon Nov 16 23:55:16 2020
@@ -30,13 +30,13 @@
${HARFBUZZ_INCLUDE_DIRS}
)
+include(colormgmt/CMakeLists.txt)
+include(desaxe/CMakeLists.txt)
+include(fonts/CMakeLists.txt)
+include(styles/CMakeLists.txt)
include(text/CMakeLists.txt)
add_subdirectory(dtd)
-add_subdirectory(colormgmt)
-add_subdirectory(desaxe)
-add_subdirectory(fonts)
-add_subdirectory(styles)
add_subdirectory(ui/qml)
if(WITH_TESTS)
add_subdirectory(tests)
@@ -582,6 +582,7 @@
ui/weldedit.h
# #{SCRIBUS_ITEMSETTERS_CLASS}
${SCRIBUS_OSG_CLASS}
+ ${SCRIBUS_STYLES_MOC_CLASSES}
${SCRIBUS_TEXT_MOC_CLASSES}
)
@@ -1099,7 +1100,6 @@
# #{SCRIBUS_ITEMSETTERS_SRC}
${SCRIBUS_OSG_SRC}
${SCRIBUS_GMAGICK_SRC}
- ${SCRIBUS_TEXT_LIB_SOURCES}
)
if(NOT HAVE_HYPHEN)
@@ -1135,10 +1135,6 @@
)
link_directories(
- ${CMAKE_CURRENT_BINARY_DIR}/colormgmt
- ${CMAKE_CURRENT_BINARY_DIR}/desaxe
- ${CMAKE_CURRENT_BINARY_DIR}/fonts
- ${CMAKE_CURRENT_BINARY_DIR}/styles
${CMAKE_CURRENT_BINARY_DIR}/third_party/wpg
${CMAKE_CURRENT_BINARY_DIR}/third_party/pgf
${CMAKE_CURRENT_BINARY_DIR}/third_party/rtf-qt
@@ -1159,16 +1155,11 @@
link_directories( ${CMAKE_CURRENT_BINARY_DIR}/third_party/lib2geom )
endif ()
-set(SCRIBUS_COLORMGMT_LIB "scribus_colormgmt_lib")
-
if(WITH_TESTS)
set(SCRIBUS_TESTS_LIB "scribus_tests_lib")
else()
set(SCRIBUS_TESTS_LIB "")
endif()
-set(SCRIBUS_STYLES_LIB "scribus_styles_lib")
-set(SCRIBUS_FONTS_LIB "scribus_fonts_lib")
-set(SCRIBUS_DESAXE_LIB "scribus_desaxe_lib")
if(HAVE_OSG)
set(SCRIBUS_PRC_LIB "scribus_prc_lib")
endif ()
@@ -1231,13 +1222,14 @@
if(HAVE_OSG)
add_executable(${EXE_NAME}
${SCRIBUS_MOC_SOURCES}
+ ${SCRIBUS_MAIN_CPP}
${SCRIBUS_SOURCES}
- ${SCRIBUS_MAIN_CPP}
+ ${SCRIBUS_COLORMGMT_SOURCES}
+ ${SCRIBUS_DESAXE_SOURCES}
+ ${SCRIBUS_FONTS_SOURCES}
+ ${SCRIBUS_STYLES_SOURCES}
+ ${SCRIBUS_TEXT_SOURCES}
${SCRIBUS_UI_SOURCES}
- ${SCRIBUS_STYLES_SOURCES}
- ${SCRIBUS_COLORMGMT_SOURCES}
- ${SCRIBUS_FONTS_SOURCES}
- ${SCRIBUS_DESAXE_SOURCES}
${SCRIBUS_WIN32_ONLY_SOURCES}
${GESTURE_FRAME_PREVIEW_SOURCES}
${SCRIBUS_PRC_SOURCES}
@@ -1245,13 +1237,14 @@
else()
add_executable(${EXE_NAME}
${SCRIBUS_MOC_SOURCES}
+ ${SCRIBUS_MAIN_CPP}
${SCRIBUS_SOURCES}
- ${SCRIBUS_MAIN_CPP}
+ ${SCRIBUS_COLORMGMT_SOURCES}
+ ${SCRIBUS_DESAXE_SOURCES}
+ ${SCRIBUS_FONTS_SOURCES}
+ ${SCRIBUS_STYLES_SOURCES}
+ ${SCRIBUS_TEXT_SOURCES}
${SCRIBUS_UI_SOURCES}
- ${SCRIBUS_STYLES_SOURCES}
- ${SCRIBUS_COLORMGMT_SOURCES}
- ${SCRIBUS_FONTS_SOURCES}
- ${SCRIBUS_DESAXE_SOURCES}
${SCRIBUS_WIN32_ONLY_SOURCES}
${GESTURE_FRAME_PREVIEW_SOURCES}
)
@@ -1361,10 +1354,6 @@
endif ()
target_link_libraries(${EXE_NAME}
- ${SCRIBUS_COLORMGMT_LIB}
- ${SCRIBUS_DESAXE_LIB}
- ${SCRIBUS_STYLES_LIB}
- ${SCRIBUS_FONTS_LIB}
${SCRIBUS_WPG_LIB}
${SCRIBUS_PGF_LIB}
${SCRIBUS_ZIP_LIB}
Modified: trunk/Scribus/scribus/colormgmt/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24260&path=/trunk/Scribus/scribus/colormgmt/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/colormgmt/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/colormgmt/CMakeLists.txt Mon Nov 16 23:55:16 2020
@@ -1,43 +1,30 @@
-include_directories(
-${CMAKE_SOURCE_DIR}
-${CMAKE_SOURCE_DIR}/scribus
+
+include_directories( ${LCMS2_INCLUDE_DIR} )
+
+set(SCRIBUS_LCMS_IMPL_SOURCES
+ colormgmt/sclcms2colormgmtengineimpl.cpp
+ colormgmt/sclcms2colorprofileimpl.cpp
+ colormgmt/sclcms2colortransformimpl.cpp
)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
-
-include_directories( ${LCMS2_INCLUDE_DIR} )
-set(SCRIBUS_LCMS_IMPL_SOURCES
- sclcms2colormgmtengineimpl.cpp
- sclcms2colorprofileimpl.cpp
- sclcms2colortransformimpl.cpp
-)
-
-set(SCRIBUS_COLORMGMT_LIB_SOURCES
- scciedata.cpp
- sccieilluminants.cpp
- sccieobservers.cpp
- sccolormgmtengine.cpp
- sccolormgmtenginedata.cpp
- sccolormgmtenginefactory.cpp
- sccolormgmtimplelem.cpp
- sccolormgmtstructs.cpp
- sccolorprofile.cpp
- sccolorprofilecache.cpp
- sccolorprofiledata.cpp
- sccolorspace.cpp
- sccolorspacedata.cpp
- sccolortransform.cpp
- sccolortransformpool.cpp
- sce308tables.cpp
- scspectralvaluesconvertor.cpp
+set(SCRIBUS_COLORMGMT_SOURCES
+ colormgmt/scciedata.cpp
+ colormgmt/sccieilluminants.cpp
+ colormgmt/sccieobservers.cpp
+ colormgmt/sccolormgmtengine.cpp
+ colormgmt/sccolormgmtenginedata.cpp
+ colormgmt/sccolormgmtenginefactory.cpp
+ colormgmt/sccolormgmtimplelem.cpp
+ colormgmt/sccolormgmtstructs.cpp
+ colormgmt/sccolorprofile.cpp
+ colormgmt/sccolorprofilecache.cpp
+ colormgmt/sccolorprofiledata.cpp
+ colormgmt/sccolorspace.cpp
+ colormgmt/sccolorspacedata.cpp
+ colormgmt/sccolortransform.cpp
+ colormgmt/sccolortransformpool.cpp
+ colormgmt/sce308tables.cpp
+ colormgmt/scspectralvaluesconvertor.cpp
${SCRIBUS_LCMS_IMPL_SOURCES}
)
-set(SCRIBUS_COLORMGMT_LIB "scribus_colormgmt_lib")
-add_library(${SCRIBUS_COLORMGMT_LIB} STATIC ${SCRIBUS_COLORMGMT_LIB_SOURCES})
-# This is a convenience library that for linkage purposes is part of Scribus's
-# main API.
-set_target_properties(${SCRIBUS_COLORMGMT_LIB}
- PROPERTIES
- COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
- )
Modified: trunk/Scribus/scribus/desaxe/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24260&path=/trunk/Scribus/scribus/desaxe/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/desaxe/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/desaxe/CMakeLists.txt Mon Nov 16 23:55:16 2020
@@ -1,26 +1,9 @@
-include_directories(
-${CMAKE_SOURCE_DIR}
-${CMAKE_SOURCE_DIR}/scribus
-${FREETYPE_INCLUDE_DIRS}
+
+set(SCRIBUS_DESAXE_SOURCES
+ desaxe/digester.cpp
+ desaxe/digester_parse.cpp
+ desaxe/saxfilter.cpp
+ desaxe/saxiohelper.cpp
+ desaxe/saxXML.cpp
+ desaxe/uniqueid.cpp
)
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
-
-set(SCRIBUS_DESAXE_LIB_SOURCES
-saxXML.cpp
-saxiohelper.cpp
-saxfilter.cpp
-uniqueid.cpp
-digester.cpp
-digester_parse.cpp
-)
-
-set(SCRIBUS_DESAXE_LIB "scribus_desaxe_lib")
-add_library(${SCRIBUS_DESAXE_LIB} STATIC ${SCRIBUS_DESAXE_LIB_SOURCES})
-
-# This is a convenience library that for linkage purposes is part of Scribus's
-# main API.
-set_target_properties(${SCRIBUS_DESAXE_LIB}
- PROPERTIES
- COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
- )
Modified: trunk/Scribus/scribus/fonts/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24260&path=/trunk/Scribus/scribus/fonts/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/fonts/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/fonts/CMakeLists.txt Mon Nov 16 23:55:16 2020
@@ -1,27 +1,11 @@
-include_directories(
-${CMAKE_SOURCE_DIR}
-${CMAKE_SOURCE_DIR}/scribus
-${FREETYPE_INCLUDE_DIRS}
-${HARFBUZZ_INCLUDE_DIRS}
+set(SCRIBUS_FONTS_SOURCES
+ fonts/cff.cpp
+ fonts/fontfeatures.cpp
+ fonts/ftface.cpp
+ fonts/scface.cpp
+ fonts/scface_ps.cpp
+ fonts/scface_ttf.cpp
+ fonts/scfontmetrics.cpp
+ fonts/sfnt.cpp
)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
-
-set(SCRIBUS_FONTS_LIB_SOURCES
- cff.cpp
- fontfeatures.cpp
- ftface.cpp
- scface.cpp
- scface_ps.cpp
- scface_ttf.cpp
- scfontmetrics.cpp
- sfnt.cpp
-)
-set(SCRIBUS_FONTS_LIB "scribus_fonts_lib")
-add_library(${SCRIBUS_FONTS_LIB} STATIC ${SCRIBUS_FONTS_LIB_SOURCES})
-# This is a convenience library that for linkage purposes is part of Scribus's
-# main API.
-set_target_properties(${SCRIBUS_FONTS_LIB}
- PROPERTIES
- COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
- )
Modified: trunk/Scribus/scribus/styles/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24260&path=/trunk/Scribus/scribus/styles/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/styles/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/styles/CMakeLists.txt Mon Nov 16 23:55:16 2020
@@ -1,33 +1,14 @@
-include_directories(
- ${CMAKE_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/scribus
- ${FREETYPE_INCLUDE_DIRS}
-)
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
-
set(SCRIBUS_STYLES_MOC_CLASSES
)
-set(SCRIBUS_STYLES_LIB_SOURCES
- style.cpp
- stylecontext.cpp
- stylecontextproxy.cpp
- linestyle.cpp
- charstyle.cpp
- paragraphstyle.cpp
- tablestyle.cpp
- cellstyle.cpp
+set(SCRIBUS_STYLES_SOURCES
+ styles/cellstyle.cpp
+ styles/charstyle.cpp
+ styles/linestyle.cpp
+ styles/paragraphstyle.cpp
+ styles/style.cpp
+ styles/stylecontext.cpp
+ styles/stylecontextproxy.cpp
+ styles/tablestyle.cpp
)
-QT5_WRAP_CPP(SCRIBUS_STYLES_MOC_SOURCES ${SCRIBUS_STYLES_MOC_CLASSES})
-
-set(SCRIBUS_STYLES_LIB "scribus_styles_lib")
-add_library(${SCRIBUS_STYLES_LIB} STATIC ${SCRIBUS_STYLES_LIB_SOURCES} ${SCRIBUS_STYLES_MOC_SOURCES})
-
-# This is a convenience library that for linkage purposes is part of Scribus's
-# main API.
-set_target_properties(${SCRIBUS_STYLES_LIB}
- PROPERTIES
- COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
-)
Modified: trunk/Scribus/scribus/text/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24260&path=/trunk/Scribus/scribus/text/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/text/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/text/CMakeLists.txt Mon Nov 16 23:55:16 2020
@@ -2,7 +2,7 @@
text/storytext.h
)
-set(SCRIBUS_TEXT_LIB_SOURCES
+set(SCRIBUS_TEXT_SOURCES
text/boxes.cpp
text/frect.cpp
text/fsize.cpp
More information about the scribus-commit
mailing list