From 2bd8db184f4cbb98ce106f63095b16a245e21701 Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Sat, 17 May 2014 10:59:25 +0200 Subject: [PATCH 1/2] Fixed the findscript for jreen to work without pkgconf. --- CMakeModules/FindJreen.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeModules/FindJreen.cmake b/CMakeModules/FindJreen.cmake index 4f2965e8a..8ac93b5c5 100644 --- a/CMakeModules/FindJreen.cmake +++ b/CMakeModules/FindJreen.cmake @@ -16,6 +16,7 @@ FIND_PATH(JREEN_INCLUDE_DIR NAMES jreen/jreen.h ${PC_JREEN_INCLUDEDIR} ${PC_JREEN_INCLUDE_DIRS} ${CMAKE_INSTALL_INCLUDEDIR} + ${CMAKE_PREFIX_PATH}/include/jreen${JREEN_LIB_SUFFIX} ${KDE4_INCLUDE_DIR} ) From 41eacbd4f6bec862169a71a365ad057c042aaca1 Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Sat, 17 May 2014 13:14:32 +0200 Subject: [PATCH 2/2] real fix for qt4 and qt5 to find libjreen without pkg-config --- CMakeModules/FindJreen.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeModules/FindJreen.cmake b/CMakeModules/FindJreen.cmake index 8ac93b5c5..d14ca22e1 100644 --- a/CMakeModules/FindJreen.cmake +++ b/CMakeModules/FindJreen.cmake @@ -8,6 +8,9 @@ FIND_PACKAGE(PkgConfig QUIET) if( TOMAHAWK_QT5 ) set(JREEN_LIB_SUFFIX "-qt5") + set(JREEN_INCLUDE_SUFFIX ${JREEN_LIB_SUFFIX}) +else() + set(JREEN_INCLUDE_SUFFIX "-qt4") endif() PKG_CHECK_MODULES(PC_JREEN QUIET libjreen${JREEN_LIB_SUFFIX}) @@ -16,8 +19,10 @@ FIND_PATH(JREEN_INCLUDE_DIR NAMES jreen/jreen.h ${PC_JREEN_INCLUDEDIR} ${PC_JREEN_INCLUDE_DIRS} ${CMAKE_INSTALL_INCLUDEDIR} - ${CMAKE_PREFIX_PATH}/include/jreen${JREEN_LIB_SUFFIX} ${KDE4_INCLUDE_DIR} + PATH_SUFFIXES + jreen${JREEN_INCLUDE_SUFFIX} + ) FIND_LIBRARY(JREEN_LIBRARIES NAMES jreen${JREEN_LIB_SUFFIX}