> On June 12, 2013, 7:46 a.m., Vadim Zhukov wrote: > > cmake/modules/FindLibRaw.cmake, line 7 > > <http://git.reviewboard.kde.org/r/110962/diff/2/?file=149642#file149642line7> > > > > Better "the additional compiler definitions..." to avoid confusion.
Or ever "the additional compiler flags...", that will be more correct. > On June 12, 2013, 7:46 a.m., Vadim Zhukov wrote: > > cmake/modules/FindLibRaw.cmake, line 43 > > <http://git.reviewboard.kde.org/r/110962/diff/2/?file=149642#file149642line43> > > > > So what if upstream changes: > > > > #define LIBRAW_MAJOR_VERSION 1 > > > > to: > > > > enum LIBRAW_MAJOR_VERSION 1 // my major version > > > > ? Or what if those definitions go to another header file, like > > libraw_version_1.h, and libraw_version.h becomes a stub? I mean: enum { LIBRAW_MAJOR_VERSION 1 // my major version }; of course. - Vadim ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/110962/#review34197 ----------------------------------------------------------- On June 12, 2013, 1:28 a.m., Pino Toscano wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > http://git.reviewboard.kde.org/r/110962/ > ----------------------------------------------------------- > > (Updated June 12, 2013, 1:28 a.m.) > > > Review request for KDE Graphics, Release Team and Gilles Caulier. > > > Description > ------- > > Instead of using an embedded copy of LibRaw, look for an external LibRaw as > mandatory dependency with a new CMake module and using its variables. > > Considering some LibRaw versions seem to be underlinked and not linking to > OpenMP, link it manually in libkdcraw to overcome such lack. > > Switch back to the MAKE_KDCRAW_LIB define (i.e. the default set by > KDE4_ADD_LIBRARY) as the one used to check whether it is being built, as > otherwise LIBRAW_BUILDLIB would conflict with LibRaw. > > Once this RR is approved, I will remove the libraw code copy and the CMake > modules (FindLCMS2.cmake and FindPthreads.cmake) needed for it. > > > This addresses bug 307146. > http://bugs.kde.org/show_bug.cgi?id=307146 > > > Diffs > ----- > > CMakeLists.txt f2f269609feb10947ec3bac10125b379c6c821dd > cmake/modules/FindLibRaw.cmake PRE-CREATION > libkdcraw/CMakeLists.txt cce5d6dba690fb5182638ccd1f10488bbd6ec2ce > libkdcraw/libkdcraw_export.h 1a222a03502a0e068bdba4f03b7ff4961c4a8f2b > > Diff: http://git.reviewboard.kde.org/r/110962/diff/ > > > Testing > ------- > > Compiles fine with both LibRaw 0.14.7 and 0.15.1. > > > Thanks, > > Pino Toscano > >
_______________________________________________ release-team mailing list release-team@kde.org https://mail.kde.org/mailman/listinfo/release-team