r21540 by craig - Add in CTL harfbuzz and icu dependency checks

[scribus-commit]

Author: craig
Date: Sun Nov 27 09:51:48 2016
New Revision: 21540

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21540
Log:
Add in CTL harfbuzz and icu dependency checks

Modified:
    trunk/Scribus/.travis.yml
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/scribus/CMakeLists.txt

Modified: trunk/Scribus/.travis.yml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21540&path=/trunk/Scribus/.travis.yml
==============================================================================
--- trunk/Scribus/.travis.yml	(original)
+++ trunk/Scribus/.travis.yml	Sun Nov 27 09:51:48 2016
@@ -28,6 +28,7 @@
       sudo apt-get update -qq; 
       sudo apt-get install --force-yes cmake libboost-python-dev libcups2-dev libhunspell-dev
       libhyphen-dev liblcms2-dev libpodofo-dev libtiff-dev libxml2-dev
+      libharfbuzz-dev libicu-dev
       python-all-dev zlib1g-dev qt57base qt57declarative
       qt57tools libgraphicsmagick++1-dev
       libopenscenegraph-dev libpoppler-dev libcairo2-dev libwpg-dev libmspub-dev
@@ -46,7 +47,7 @@
       brew outdated pkg-config --verbose || brew upgrade pkg-config; 
       brew outdated boost || brew upgrade boost; 
       brew outdated freetype || brew upgrade freetype; 
-      brew install librevenge libwpg libvisio libmspub libcdr libpagemaker libfreehand open-scene-graph; 
+      brew install librevenge libwpg libvisio libmspub libcdr libpagemaker libfreehand open-scene-graph harfbuzz; 
     fi
   # - export LDFLAGS+=-L/usr/local/opt/zlib/lib:-L/usr/local/opt/gettext/lib:-L/usr/local/opt/libffi/lib:-L/usr/local/opt/qt5/lib:-L/usr/local/opt/sqlite/lib:-L/usr/local/opt/openssl/lib:-L/usr/local/opt/icu4c/lib
   # - export CXXFLAGS+=-I/usr/local/opt/zlib/include:-I/usr/local/opt/gettext/include:-I/usr/local/opt/qt5/include:-I/usr/local/opt/sqlite/include:-I/usr/local/opt/openssl/include:-I/usr/local/opt/icu4c/include 

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21540&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Sun Nov 27 09:51:48 2016
@@ -909,8 +909,12 @@
 ENDIF (LIBREVENGE_FOUND)
 
 # CTL support
-#pkg_check_modules(HARFBUZZ REQUIRED harfbuzz>=0.9.42 harfbuzz-icu)
-#pkg_check_modules(ICU REQUIRED icu-uc)
+pkg_check_modules(HARFBUZZ REQUIRED harfbuzz>=0.9.42 harfbuzz-icu)
+pkg_check_modules(ICU REQUIRED icu-uc)
+
+#MESSAGE(STATUS "${HARFBUZZ_INCLUDE_DIRS}")
+#MESSAGE(STATUS "${ICU_INCLUDE_DIRS}")
+
 
 ##############################################################################################################
 ########## Include Setup                                                                            ##########
@@ -967,6 +971,8 @@
 	${OPENGL_INCLUDE_DIR}
 	${OSG_INCLUDE_DIR}
 	${GSL_INCLUDE_DIR}
+	${HARFBUZZ_INCLUDE_DIRS}
+	${ICU_INCLUDE_DIRS}
 )
 
 IF (NOT WIN32 AND NOT HAIKU)

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21540&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/CMakeLists.txt	Sun Nov 27 09:51:48 2016
@@ -1222,6 +1222,8 @@
 	${ZLIB_LIBRARIES}
 	${WIN32_ONLY_LIBS}
 	${GMAGICK_LIBRARIES}
+	${HARFBUZZ_LIBRARIES}
+	${ICU_LIBRARIES}
 )
 
 IF (NOT WIN32 AND NOT HAIKU)