c++/CMakeLists.txt

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Mon Mar 12 15:41:18 CET 2012


 c++/CMakeLists.txt |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a1d82b48fcf9926a6f35d170ab6317561ec6dff2
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Mar 8 12:13:45 2012 +0000

    Also search the kde4/devel sub-directory for kdecore (Fedora)
    
    Conflicts:
    
    	c++/CMakeLists.txt

diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt
index 17c0bbe..5c75450 100644
--- a/c++/CMakeLists.txt
+++ b/c++/CMakeLists.txt
@@ -39,7 +39,7 @@ if(SWIG)
 endif(SWIG)
 
 #We search for the needed libraries manually because FindKDE.cmake sets a miriad of linker options which we don't want.
-find_library(KDECORE NAMES kdecore)
+find_library(KDECORE NAMES kdecore PATH_SUFFIXES kde4/devel)
 if(KDECORE)
     set(KDECORE_FOUND ON)
     message("KDElibs found")
@@ -119,3 +119,4 @@ if (${QT_FOUND})
     add_subdirectory(tests)
 endif()
 
+add_subdirectory(upgradetool)





More information about the commits mailing list