From 48a9edc61d5c97bc8c564f898a010d744abad8d9 Mon Sep 17 00:00:00 2001
From: nabijaczleweli-vm <nabijaczleweli@gmail.com>
Date: Thu, 11 Feb 2016 18:09:50 +0100
Subject: [PATCH] Xft

---
 .travis.yml    |  3 +++
 CMakeLists.txt | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7125186c..f1995a39 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,7 @@ matrix:
             - alsa-utils
             - alsa-oss
             - libx11-dev
+            - libxft-dev
           sources: 
             - ubuntu-toolchain-r-test
     - env: CXX=g++-4.9 CC=gcc-4.9
@@ -32,6 +33,7 @@ matrix:
             - alsa-utils
             - alsa-oss
             - libx11-dev
+            - libxft-dev
           sources: 
             - ubuntu-toolchain-r-test
             
@@ -47,6 +49,7 @@ matrix:
             - alsa-utils
             - alsa-oss
             - libx11-dev
+            - libxft-dev
           sources: 
             - ubuntu-toolchain-r-test
             - llvm-toolchain-precise 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3568bfe8..dbce8493 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,52 +189,52 @@ if (BUILD_NANA_DEMOS)
     set(CMAKE_INSTALL_PREFIX )
     add_executable(file_explorer ../nana-demo/file_explorer.cpp)
     set_property( TARGET file_explorer PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(file_explorer ${PROJECT_NAME} X11)
+    target_link_libraries(file_explorer ${PROJECT_NAME} X11 Xft)
     install(TARGETS file_explorer RUNTIME DESTINATION &{DEMO_BIN})
 
     add_executable(calculator ../nana-demo/calculator.cpp)
     set_property( TARGET calculator PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(calculator ${PROJECT_NAME} X11)
+    target_link_libraries(calculator ${PROJECT_NAME} X11 Xft)
     install(TARGETS calculator RUNTIME DESTINATION &{DEMO_BIN})
 
     if (BUILD_FreeMe)
         add_executable(FreeMe ../nana-demo/FreeMe.cpp)
         set_property( TARGET FreeMe PROPERTY CXX_STANDARD 14 )
-        target_link_libraries(FreeMe ${PROJECT_NAME} X11)
+        target_link_libraries(FreeMe ${PROJECT_NAME} X11 Xft)
         install(TARGETS FreeMe RUNTIME DESTINATION &{DEMO_BIN})
     endif (BUILD_FreeMe)     
 
     add_executable(notepad ../nana-demo/notepad.cpp)
     set_property( TARGET notepad PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(notepad ${PROJECT_NAME} X11)
+    target_link_libraries(notepad ${PROJECT_NAME} X11 Xft)
     install(TARGETS notepad RUNTIME DESTINATION &{DEMO_BIN})
 
     add_executable(widget_show ../nana-demo/widget_show.cpp)
     set_property( TARGET widget_show PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(widget_show ${PROJECT_NAME} X11)
+    target_link_libraries(widget_show ${PROJECT_NAME} X11 Xft)
     install(TARGETS widget_show RUNTIME DESTINATION &{DEMO_BIN})
 
     add_executable(widget_show2 ../nana-demo/widget_show2.cpp)
     set_property( TARGET widget_show2 PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(widget_show2 ${PROJECT_NAME} X11)
+    target_link_libraries(widget_show2 ${PROJECT_NAME} X11 Xft)
     install(TARGETS widget_show2 RUNTIME DESTINATION &{DEMO_BIN})
 
     add_executable(a_group_impl ../nana-demo/Examples/a_group_impl.cpp)
     set_property( TARGET a_group_impl PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(a_group_impl ${PROJECT_NAME} X11)
+    target_link_libraries(a_group_impl ${PROJECT_NAME} X11 Xft)
 
     add_executable(animate-bmp ../nana-demo/Examples/animate-bmp.cpp)
     set_property( TARGET animate-bmp PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(animate-bmp ${PROJECT_NAME} X11)
+    target_link_libraries(animate-bmp ${PROJECT_NAME} X11 Xft)
 
     add_executable(audio_player ../nana-demo/Examples/audio_player.cpp)
     set_property( TARGET audio_player PROPERTY CXX_STANDARD 14 )
-    target_link_libraries(audio_player ${PROJECT_NAME} X11)
+    target_link_libraries(audio_player ${PROJECT_NAME} X11 Xft)
 
 
     #add_executable(nana_test test.cpp)
     #set_property( TARGET nana_test PROPERTY CXX_STANDARD 14 )
-    #target_link_libraries(nana_test ${PROJECT_NAME} X11)
+    #target_link_libraries(nana_test ${PROJECT_NAME} X11 Xft)
 
    #set(NANA_DEMOS_DIR ${CMAKE_SOURCE_DIR}/../nana-demo)
    #set(NANA_EXAMPLES_DIR ${CMAKE_SOURCE_DIR}/../Examples/nana-demo/)
@@ -245,7 +245,7 @@ if (BUILD_NANA_DEMOS)
    #    string( REPLACE ".cpp" "" demoname ${demofile} )
    #    add_executable( ${demoname} ${demofile} )
    #    set_property( TARGET ${demoname} PROPERTY CXX_STANDARD 14 )
-   #    target_link_libraries(${demoname} ${PROJECT_NAME} X11)
+   #    target_link_libraries(${demoname} ${PROJECT_NAME} X11 Xft)
    #endforeach( demofile ${DEMO_SOURCES} )
 endif(BUILD_NANA_DEMOS)