r598290 | mlaurent | 2006-10-23 08:53:27 +0200 (Mon, 23 Oct 2006) | 5 lines
Apply Alex patch (now we can use enable-final argument
some module compiles with enable-final now)
As discussed with Alex it's not necessary to have program name
into automoc macro
svn path=/trunk/KDE/kdebase/workspace/; revision=659295
svn path=/trunk/KDE/kdebase/workspace/; revision=639986
The following changes were in SVN, but were removed from git:
M wallpapers/All-Good-People-1.jpg.desktop
M wallpapers/Chicken-Songs-2.jpg.desktop
M wallpapers/No-Ones-Laughing-3.jpg.desktop
M wallpapers/Time-For-Lunch-2.jpg.desktop
M wallpapers/Totally-New-Product-1.jpg.desktop
M wallpapers/Won-Ton-Soup-3.jpg.desktop
M wallpapers/alta-badia.jpg.desktop
M wallpapers/andes-venezolanos.svgz.desktop
M wallpapers/aurora.svgz.desktop
M wallpapers/blue-bend.jpg.desktop
M wallpapers/celtic.svgz.desktop
M wallpapers/default_blue.jpg.desktop
M wallpapers/default_gears.jpg.desktop
M wallpapers/floating-leaves.jpg.desktop
M wallpapers/globe.svgz.desktop
M wallpapers/here-gear.svgz.desktop
M wallpapers/konqui.svgz.desktop
M wallpapers/lineart.svgz.desktop
M wallpapers/moon.svgz.desktop
M wallpapers/seaofconero.jpg.desktop
M wallpapers/soft-green.jpg.desktop
M wallpapers/stelvio.jpg.desktop
M wallpapers/sunshine-after-the-rain.jpg.desktop
M wallpapers/triplegears.jpg.desktop
some module compiles with enable-final now)
As discussed with Alex it's not necessary to have program name
into automoc macro
svn path=/trunk/KDE/kdebase/workspace/; revision=598290
enable-final argument
(there was not a dependancy between <name>_final.cpp file and
moc generated files => moc files were never created)
Not necessary to rebuild all kdelibs just cp kdelibs/cmake/modules/KDE4Macros.cmake <path_kde4>/share/apps/cmake/modules
I ported and tested all kde module (without enable-final argument, it compiles fines (test and program))
Don't try to use enable-final argument for the moment it doesn't compile (but dependancy works)
Regards
svn path=/trunk/KDE/kdebase/workspace/; revision=595039
-cleanup the toplevel CMakeLists.txt a bit
-remove include_directories( CMAKE_CURRENT_SOURCE_DIR CMAKE_CURRENT_BINARY_DIR)
in the subdirs, since this is done now automatically by cmake (the CMAKE_INCLUDE_CURRENT_DIR option
-include_directories(KDE4_INCLUDES) in the toplevel CMakeLists.txt, so it
doesn't have to be done in every subdir
Alex
svn path=/trunk/KDE/kdebase/workspace/; revision=539914
The following changes were in SVN, but were removed from git:
M wallpapers/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} in each and every file anymore [only when subdirs might depend on that].
Also ran a script which makes sure that ${KDE4_INCLUDE_DIR} and ${QT_INCLUDES} are added -last-,
so that installed headers are not preferred over (possibly more uptodate) local headers.
svn path=/trunk/KDE/kdebase/workspace/; revision=521887
The following changes were in SVN, but were removed from git:
M wallpapers/CMakeLists.txt
BE CARREFULL: Don't try to compile it for the moment (in progress)
Don't use kdelibs trunk for compile it (there is not again test to disable
compile when we compile with kdelibs trunk)
For the moment there was a lot of missing test etc.
I commit it just to allow to lose my changes if there is a pb on my HD.
I will sync cmake from kdelibs trunk to kdelibs-snapshot.
I hope to fix compile today or tomorrow.
CCMAIL: neundorf@kde.org
For the futur we must sync kdelibs/cmake/* to kdelibs-snapshot
to compile all the time with kdelibs-snapshot
svn path=/trunk/KDE/kdebase/workspace/; revision=514380
The following changes were in SVN, but were removed from git:
A wallpapers/CMakeLists.txt
svn path=/trunk/KDE/kdebase/workspace/; revision=495177
The following changes were in SVN, but were removed from git:
M wallpapers/All-Good-People-1.jpg.desktop
M wallpapers/Chicken-Songs-2.jpg.desktop
M wallpapers/KDE34.png.desktop
M wallpapers/No-Ones-Laughing-3.jpg.desktop
M wallpapers/Time-For-Lunch-2.jpg.desktop
M wallpapers/Totally-New-Product-1.jpg.desktop
M wallpapers/Won-Ton-Soup-3.jpg.desktop
M wallpapers/alta-badia.jpg.desktop
M wallpapers/andes-venezolanos.svgz.desktop
M wallpapers/aurora.svgz.desktop
M wallpapers/blue-bend.jpg.desktop
M wallpapers/celtic.svgz.desktop
M wallpapers/default_blue.jpg.desktop
M wallpapers/default_gears.jpg.desktop
M wallpapers/floating-leaves.jpg.desktop
M wallpapers/globe.svgz.desktop
M wallpapers/here-gear.svgz.desktop
M wallpapers/kde_box.png.desktop
M wallpapers/konqui.svgz.desktop
M wallpapers/lineart.svgz.desktop
M wallpapers/moon.svgz.desktop
M wallpapers/seaofconero.jpg.desktop
M wallpapers/soft-green.jpg.desktop
M wallpapers/stelvio.jpg.desktop
M wallpapers/sunshine-after-the-rain.jpg.desktop
M wallpapers/triplegears.jpg.desktop
svn+ssh://coolo@svn.kde.org/home/kde/branches/work/kde4/kdebase
.
I couldn't resolve one kicker conflict that results from different
development directions, so I rely on Aaron to sort it out - the file
is commited with conflicts
svn path=/trunk/KDE/kdebase/kwin/; revision=439627
