[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/apps/nsplugins/viewer
From:       David Faure <faure () kde ! org>
Date:       2008-07-17 15:30:05
Message-ID: 1216308605.263027.21952.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 833928 by dfaure:

Fix errors when glib2 isn't found (from error posted by em_pl on irc)


 M  +10 -2     CMakeLists.txt  


--- trunk/KDE/kdebase/apps/nsplugins/viewer/CMakeLists.txt #833927:833928
@@ -1,5 +1,9 @@
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/.. \
${GLIB2_INCLUDE_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. \
${CMAKE_CURRENT_BINARY_DIR}/..)  
+if (GLIB2_FOUND)
+  include_directories(${GLIB2_INCLUDE_DIR})
+endif (GLIB2_FOUND)
+
 ########### next target ###############
 
 set(nspluginviewer_SRCS nsplugin.cpp viewer.cpp xtevents.cpp glibevents.cpp
@@ -15,7 +19,11 @@
 
 kde4_add_executable(nspluginviewer ${nspluginviewer_SRCS})
 
-target_link_libraries(nspluginviewer ${KDE4_KPARTS_LIBS} ${X11_Xt_LIB} \
${QT_QTDBUS_LIBRARY} ${CMAKE_DL_LIBS} ${GLIB2_LIBRARIES}) \
+target_link_libraries(nspluginviewer ${KDE4_KPARTS_LIBS} ${X11_Xt_LIB} \
${QT_QTDBUS_LIBRARY} ${CMAKE_DL_LIBS}) +if (GLIB2_FOUND)
+   target_link_libraries(nspluginviewer ${GLIB2_LIBRARIES})
+endif (GLIB2_FOUND)
 
+
 install(TARGETS nspluginviewer ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES org.kde.nsplugins.class.xml org.kde.nsplugins.instance.xml \
org.kde.nsplugins.viewer.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )


[prev in list] [next in list] [prev in thread] [next in thread]