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

List:       kde-commits
Subject:    Re: koffice/kexi/kexidb/drivers
From:       Thomas Zander <zander () kde ! org>
Date:       2010-01-29 23:49:33
Message-ID: 201001300049.35953.zander () kde ! org
[Download RAW message or body]

On Friday 29. January 2010 21.48.30 Adam Pigg wrote:
> SVN commit 1082151 by piggz:
> 
> Make the sqlite driver use the system install libsqlite3.
> Added an initial version check for 3.6.20...feel free to change
> Still some TODOs for some commented out sections.
> CCMAIL: staniek@kde.org
> 
>  M  +8 -2      CMakeLists.txt
>  M  +2 -2      sqlite/CMakeLists.txt
>  M  +15 -8     sqlite/sqliteconnection.cpp
>  M  +1 -1      sqlite/sqliteconnection_p.h
>  M  +1 -1      sqlite/sqlitedriver.cpp
> 
> 
> --- trunk/koffice/kexi/kexidb/drivers/CMakeLists.txt #1082150:1082151
> @@ -2,8 +2,14 @@
>  # drivers will be moved out of this dir in Predicate, and then area will
>  be redefined #remove_definitions(-DKDE_DEFAULT_DEBUG_AREA)
>  #add_definitions(-DKDE_DEFAULT_DEBUG_AREA=44001)
> +INCLUDE (FindPkgConfig)
> 
> -add_subdirectory( sqlite )
> +pkg_check_modules (SQLITE3 REQUIRED sqlite3>=3.6.20)
> +

This is the wrong approach; you should not make KOffice as a whole stop 
compiling if a kexi dependency is missing.
Please change to instead disable kexi from compilation.
-- 
Thomas Zander
[prev in list] [next in list] [prev in thread] [next in thread]