> On 2009-02-20 20:59:02, Matt Rogers wrote: > > I would rather the find and include stuff for KDE 4 be included in the > > repository as well. You could add a variable to kdenetwork/CMakeLists.txt > > like INSIDE_KDENETWORK which is always set to one, and then wrap all the > > extra stuff needed to build kopete outside of kdenetwork in an "IF(NOT > > INSIDE_KDENETWORK)" or similar. > > > > Can you update the patch with that added logic? > > > > The .cmake files used by find_package specific to kopete will also have to > > move, and I don't see this accounted for either. (Kopete needs more than > > just kdepimlibs) > > > > (I already have a different way of managing my trees, which is why i never > > got around to this).
Done. Revision 3 of the diff is the big one. I've moved all of the kopete specific CMakeModules (and checks) to kopete/cmake/modules - gja ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: http://reviewboard.kde.org/r/142/#review208 ----------------------------------------------------------- On 2009-02-20 13:23:15, gja wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > http://reviewboard.kde.org/r/142/ > ----------------------------------------------------------- > > (Updated 2009-02-20 13:23:15) > > > Review request for Kopete, Matt Rogers and gja. > > > Summary > ------- > > Well, this is more of a patch for developers. It sets the directory which is > used for includes as /kdenetwork/kopete ratherthan /kdenetwork. This has no > effects to users or even packagers. My use case is that I have a > /src/kdenetwork/kopete (From trunk) and a /src/branch/kopete-dev-4.2. > > Kopete can now be built outside of kdenetwork just by adding the following > lines to Kopete's main CMakeLists.txt (all of these lines may not be needed): > find_package(KDE4 REQUIRED) > include (KDE4Defaults) > include (MacroLibrary) > > include(CheckIncludeFile) > include(CheckIncludeFiles) > include(CheckSymbolExists) > include(CheckFunctionExists) > include(CheckLibraryExists) > include(CheckPrototypeExists) > include(CheckTypeSize) > include(MacroBoolTo01) > include(MacroOptionalAddSubdirectory) > > find_package(KdepimLibs REQUIRED) > > add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) > include_directories (${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIR}) > > Of course, this is only useful if you plan on having multiple trees of kopete > on your system which share a single environment. This way, I can have > multiple trees of kopete, and need not worry about a separate kdenetwork tree > for each of them. Yay! > > Respond on kopete mailing list if i can commit this > > > Diffs > ----- > > /trunk/KDE/kdenetwork/kopete/protocols/yahoo/libkyahoo/tests/CMakeLists.txt > 928222 > /trunk/KDE/kdenetwork/kopete/protocols/oscar/liboscar/tests/CMakeLists.txt > 928222 > > /trunk/KDE/kdenetwork/kopete/protocols/groupwise/libgroupwise/tests/CMakeLists.txt > 928222 > > /trunk/KDE/kdenetwork/kopete/protocols/groupwise/libgroupwise/tasks/tests/CMakeLists.txt > 928222 > > /trunk/KDE/kdenetwork/kopete/protocols/groupwise/libgroupwise/CMakeLists.txt > 928222 > /trunk/KDE/kdenetwork/kopete/protocols/groupwise/CMakeLists.txt 928222 > /trunk/KDE/kdenetwork/kopete/kopete/identity/CMakeLists.txt 928222 > /trunk/KDE/kdenetwork/kopete/kopete/config/chatwindow/CMakeLists.txt 928222 > /trunk/KDE/kdenetwork/kopete/kopete/config/accounts/CMakeLists.txt 928222 > /trunk/KDE/kdenetwork/kopete/kopete/CMakeLists.txt 928222 > /trunk/KDE/kdenetwork/kopete/CMakeLists.txt 928222 > > Diff: http://reviewboard.kde.org/r/142/diff > > > Testing > ------- > > It builds here :) > > I set KOPETE_FOO_DIR to ${CMAKE_CURRENT_FOO_DIR} in the beginning, which is > guaranteed to work unless CMake Borks someday in the future. > > All paths are relative. > > > Thanks, > > gja > > _______________________________________________ kopete-devel mailing list [email protected] https://mail.kde.org/mailman/listinfo/kopete-devel
