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

List:       kde-commits
Subject:    KDE/kdelibs/khtml
From:       Thiago Macieira <thiago () kde ! org>
Date:       2007-10-24 16:48:57
Message-ID: 1193244537.499993.8747.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 728915 by thiago:

Make kdelibs build with non-CVS versions of CMake.

The GET_SOURCE_FILE_PROPERTY call is broken in current CMake (2.4.7 tested). See \
http://www.cmake.org/Bug/view.php?id=1729


 M  +8 -1      CMakeLists.txt  
 A             kcookiejar_interface.cpp   [License: GENERATED FILE]
 A             kcookiejar_interface.h   [License: GENERATED FILE]


--- trunk/KDE/kdelibs/khtml/CMakeLists.txt #728914:728915
@@ -278,7 +278,14 @@
 
 set(kcookiejar_XML ${CMAKE_CURRENT_SOURCE_DIR}/../kioslave/http/kcookiejar/org.kde.KCookieServer.xml)
  set_source_files_properties(${kcookiejar_XML} PROPERTIES INCLUDE \
                "html/kcookiejar_include.h")
-qt4_add_dbus_interface(khtml_LIB_SRCS ${kcookiejar_XML} kcookiejar_interface)
+if (cmake_version GREATER 20500)
+   # The following requires CMake CVS.
+   # See: http://www.cmake.org/Bug/view.php?id=1729
+   qt4_add_dbus_interface(khtml_LIB_SRCS ${kcookiejar_XML} kcookiejar_interface)
+else (cmake_version GREATER 20500)
+   # workaround:
+   set(khtml_LIB_SRCS ${khtml_LIB_SRCS} kcookiejar_interface.cpp \
kcookiejar_interface.h) +endif (cmake_version GREATER 20500)
 
 kde4_add_ui_files(khtml_LIB_SRCS kjserrordlgbase.ui htmlpageinfo.ui )
 


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