Blob Blame History Raw
diff -up ksirk-15.12.1/ksirk/CMakeLists.txt.system-iris ksirk-15.12.1/ksirk/CMakeLists.txt
--- ksirk-15.12.1/ksirk/CMakeLists.txt.system-iris	2015-12-15 13:27:19.000000000 -0600
+++ ksirk-15.12.1/ksirk/CMakeLists.txt	2016-01-28 13:34:17.848915711 -0600
@@ -3,12 +3,16 @@ check_include_files(sys/stropts.h SYS_ST
 configure_file(config-ksirk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksirk.h)
 
 add_subdirectory( skins )
-add_subdirectory( iris )
+#add_subdirectory( iris )
 
 # FIND_PACKAGE(QCA2 REQUIRED)
 # FIND_PACKAGE(ZLIB REQUIRED)
 # macro_log_feature(QCA2_FOUND "QCA2" "Qt Cryptographic Architecture" "http://delta.affinix.com/qca" FALSE "2.0.0" "Needed to build Ksirk Jabber support's GroupWise and Jabberprotocols.")
 
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(IRIS REQUIRED iris)
+pkg_check_modules(IRISNET REQUIRED irisnet)
+
 include_directories( 
   ${CMAKE_BINARY_DIR}/ksirk 
   ./Dialogs
@@ -18,20 +22,12 @@ include_directories(
   ./Sprites 
   ${CMAKE_CURRENT_SOURCE_DIR} 
   ${CMAKE_CURRENT_BINARY_DIR}  
-  ${CMAKE_CURRENT_SOURCE_DIR}/iris/include/iris
-  ${CMAKE_CURRENT_SOURCE_DIR}/iris/src
-#   ${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/include/
-#   ${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/jabber/
-#   ${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/xmpp-core/
-#   ${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/xmpp-im/
-#   ${CMAKE_CURRENT_SOURCE_DIR}/libiris/cutestuff/util/
-#   ${CMAKE_CURRENT_SOURCE_DIR}/libiris/cutestuff/network/
-#   ${CMAKE_CURRENT_SOURCE_DIR}/libiris/cutestuff/
-#   ${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/
   ${QCA2_INCLUDE_DIR}
+  ${IRIS_INCLUDE_DIRS}
+  ${IRISNET_INCLUDE_DIRS}
   )
 
-link_directories( ${CMAKE_CURRENT_BINARY_DIR}/iris/ )
+link_directories( ${IRIS_LIBRARY_DIRS} ${IRISNET_LIBRARY_DIRS} )
 
 ########### next target ###############
 
@@ -124,7 +120,8 @@ target_link_libraries(ksirk
   ${KDE4_PHONON_LIBRARY}
   ${KDE4_KNEWSTUFF3_LIBRARY}
   ${QCA2_LIBRARIES}
-  iris_ksirk
+  ${IRIS_LIBRARIES}
+  ${IRISNET_LIBRARIES}
   kdegames
   kdegamesprivate
   )