[Konsole-devel] [konsole] src: Look for LibKonq before using it.
Raphael Kubo da Costa
rakuco at FreeBSD.org
Sat Aug 27 19:48:24 UTC 2011
Git commit 19412f8c6814e716681a8825b907da9ebb0ae0a9 by Raphael Kubo da Costa.
Committed on 27/08/2011 at 21:46.
Pushed by rkcosta into branch 'master'.
Look for LibKonq before using it.
Follow-up to 2dcd5842552684e558716d069b73dd118035b75d.
konsole is not in the same repository as libkonq anymore, so we need
to check if it is installed before using it, and it is also better to
use the whole library path when linking instead of hardcoding "konq".
CCMAIL: konsole-devel at kde.org
M +3 -1 src/CMakeLists.txt
http://commits.kde.org/konsole/19412f8c6814e716681a8825b907da9ebb0ae0a9
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d8f8803..267a3f8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,5 @@
+macro_optional_find_package(LibKonq)
+macro_log_feature(LIBKONQ_FOUND "LibKonq" "libkonq is a construction kit for a file manager. It comes from kde-baseapps." "http://www.kde.org" TRUE)
### Compile-time features
macro_optional_find_package(XKB)
@@ -112,7 +114,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/tests/CTestCustom.cmake)
${QT_QTXML_LIBRARY}
${KDE4_KNOTIFYCONFIG_LIBRARY}
${X11_LIBRARIES}
- konq
+ ${LIBKONQ_LIBRARY}
)
# XRender library for true transparency support
More information about the konsole-devel
mailing list