KDE/kdevelop

[Matt Rogers]

SVN commit 615068 by mattr:

disable tdb for now. I don't have a shared library to link against
and the check doesn't fail gracefully enough to allow me to continue
to build.

CCMAIL: kdevelop-devel at kdevelop.org



 M  +2 -2      CMakeLists.txt  
 M  +10 -10    lib/CMakeLists.txt  


--- trunk/KDE/kdevelop/CMakeLists.txt #615067:615068
@@ -4,11 +4,11 @@
 
 find_package(KDE4 REQUIRED)
 find_package(BerkeleyDB)
-find_package(TDB)
+#find_package(TDB)
 include (KDE4Defaults)
 include (MacroLibrary)
 
-add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${BERKELEY_DB_DEFINITIONS} ${TDB_DEFINITIONS} -DHAVE_CONFIG_H=1)
+add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${BERKELEY_DB_DEFINITIONS} -DHAVE_CONFIG_H=1)
 
 link_directories (${KDE4_LIB_DIR})
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR}/threadweaver )
--- trunk/KDE/kdevelop/lib/CMakeLists.txt #615067:615068
@@ -16,9 +16,9 @@
 if (BERKELEY_DB_FOUND)
     include_directories(${BERKELEY_DB_INCLUDE_DIR})
 endif (BERKELEY_DB_FOUND)
-if (TDB_FOUND)
-    include_directories(${TDB_INCLUDE_DIR})
-endif (TDB_FOUND)
+#if (TDB_FOUND)
+#    include_directories(${TDB_INCLUDE_DIR})
+#endif (TDB_FOUND)
 
 
 ########### next target ###############
@@ -82,12 +82,12 @@
        )
 endif (BERKELEY_DB_FOUND)
 
-if (TDB_FOUND)
-    set(kdevplatform_LIB_SRCS
-        ${kdevplatform_LIB_SRCS}
-        kdevtdbcatalogbackend.cpp
-       )
-endif (TDB_FOUND)
+#if (TDB_FOUND)
+#    set(kdevplatform_LIB_SRCS
+#        ${kdevplatform_LIB_SRCS}
+#        kdevtdbcatalogbackend.cpp
+#       )
+#endif (TDB_FOUND)
 
 set(kdevplatform_UI
     mimewarningdialog.ui
@@ -97,7 +97,7 @@
 
 kde4_add_ui_files(kdevplatform_LIB_SRCS ${kdevplatform_UI})
 kde4_add_library(kdevplatform SHARED ${kdevplatform_LIB_SRCS})
-target_link_libraries(kdevplatform ${KDE4_KIO_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ktexteditor ${KDE4_THREADWEAVER_LIBRARIES} ${BERKELEY_DB_LIBRARIES} ${TDB_LIBRARIES} )
+target_link_libraries(kdevplatform ${KDE4_KIO_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ktexteditor ${KDE4_THREADWEAVER_LIBRARIES} ${BERKELEY_DB_LIBRARIES} )
 set_target_properties(kdevplatform PROPERTIES VERSION 4.0.0 SOVERSION 4)
 install(TARGETS kdevplatform DESTINATION ${LIB_INSTALL_DIR} )