digikam/digikam sub-folders created...
Locked
digikam/digikam sub-folders created...
 
|
Hi all,
In 2.0.0, i managed in-deep all *.h *.cpp in digikam/digikam dir and created a lots of sub-folder to separate classes by functions and components, instead to have a lots of source files installed at the place as well. New sub-folders are : - album : all about Albums classes. It include also AlbumManager, but i'm not sure if it's the right place... Perhaps in database dir... - database : include all classes who play with DB. It include dio syncjob and scancrontroller. - date : all date/time view and widgets, including timeline. - dragdrop : all D&D classes - filters : all filters widget. - items : all image items classes, including icon-view and preview - main : main source code for application, including relevant data files. - metadata : metadata manager is here. - models : model classes (just one for the moment) - q3support : deprecated Q3Support classes which must be ported to Qt4 model/view. Only used by Camera GUI. Perhaps i need to move it to utilities/cameragui/q3support - tags : all tags relevant classes, including rating and labels. - utils : misc classes and header files - views : all view classes. Let's me hear if all is fine for you, and if alll compile fine of course. Best Gilles Caulier _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: digikam/digikam sub-folders created...
|
|
> > Let's me hear if all is fine for you, and if alll compile fine of course. I really enjoy it. It's all so tidy now! We should have done that years ago ;-) _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: digikam/digikam sub-folders created...
|
|
In reply to this post by Gilles Caulier-4
Hi Gilles,
the new folder structure looks good. On 02/24/2011 10:54 AM, Gilles Caulier wrote: > Let's me hear if all is fine for you, and if alll compile fine of course. When I try to compile with -DKDE4_ENABLE_TESTING, CMake fails: -- Adjusting compilation flags for GCC version ( 4.4.5 ) -- Configuring done CMake Error in core/tests/CMakeLists.txt: Cannot find source file "albumsettings.cpp". Tried extensions .c .C .c++ .cc .cpp .cxx .m .M .mm .h .hh .h++ .hm .hpp .hxx .in .txx -- Build files have been written to: /c/temp/kdebuild/digikam-sc Michael _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: digikam/digikam sub-folders created...
|
|
On 02/24/2011 10:04 PM, Michael G. Hansen wrote
>> Let's me hear if all is fine for you, and if alll compile fine of course. > > When I try to compile with -DKDE4_ENABLE_TESTING, CMake fails: That should have been -DKDE4_BUILD_TESTS:BOOL=ON Michael _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: digikam/digikam sub-folders created...
|
|
I take a look
Gilles 2011/2/24 Michael G. Hansen <[hidden email]>: > On 02/24/2011 10:04 PM, Michael G. Hansen wrote >>> Let's me hear if all is fine for you, and if alll compile fine of course. >> >> When I try to compile with -DKDE4_ENABLE_TESTING, CMake fails: > > That should have been -DKDE4_BUILD_TESTS:BOOL=ON > > Michael > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: digikam/digikam sub-folders created...
|
|
Fixed....
Gilles 2011/2/24 Gilles Caulier <[hidden email]>: > I take a look > > Gilles > > 2011/2/24 Michael G. Hansen <[hidden email]>: >> On 02/24/2011 10:04 PM, Michael G. Hansen wrote >>>> Let's me hear if all is fine for you, and if alll compile fine of course. >>> >>> When I try to compile with -DKDE4_ENABLE_TESTING, CMake fails: >> >> That should have been -DKDE4_BUILD_TESTS:BOOL=ON >> >> Michael >> _______________________________________________ >> Digikam-devel mailing list >> [hidden email] >> https://mail.kde.org/mailman/listinfo/digikam-devel >> > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: digikam/digikam sub-folders created...
|
|
In reply to this post by Gilles Caulier-4
On 02/24/2011 10:54 AM, Gilles Caulier wrote:
> Let's me hear if all is fine for you, and if alll compile fine of course. Without the test building option, compilation fails here (I reset the build directory before recompiling): [ 52%] Building CXX object core/digikam/CMakeFiles/digikamcore.dir/__/libs/dimg/loaders/pngloader.cpp.o /c/temp/kde/trunk-src/digikam-sc/core/libs/dimg/loaders/pngloader.cpp:61:21: error: version.h: No such file or directory /c/temp/kde/trunk-src/digikam-sc/core/libs/dimg/loaders/pngloader.cpp: In member function 'virtual bool Digikam::PNGLoader::save(const QString&, Digikam::DImgLoaderObserver*)': /c/temp/kde/trunk-src/digikam-sc/core/libs/dimg/loaders/pngloader.cpp:892: error: 'digiKamVersion' was not declared in this scope make[2]: *** [core/digikam/CMakeFiles/digikamcore.dir/__/libs/dimg/loaders/pngloader.cpp.o] Error 1 make[1]: *** [core/digikam/CMakeFiles/digikamcore.dir/all] Error 2 make: *** [all] Error 2 Michael _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: digikam/digikam sub-folders created...
|
|
In reply to this post by Gilles Caulier-4
On 02/24/2011 10:27 PM, Gilles Caulier wrote:
> Fixed.... Confirmed ;-) _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: digikam/digikam sub-folders created...
|
|
In reply to this post by Michael G. Hansen
Strange, all compile fine here.
version.h is created in digikam/digikam/utils/ dir. File exist in you computer ? If yes, this want mean that include path is not turned on with digikam/digikam/utils/. This is strange because it already set in digikam/CMakeLists.txt file at line 1405... Gilles 2011/2/24 Michael G. Hansen <[hidden email]>: > On 02/24/2011 10:54 AM, Gilles Caulier wrote: >> Let's me hear if all is fine for you, and if alll compile fine of course. > > Without the test building option, compilation fails here (I reset the > build directory before recompiling): > > [ 52%] Building CXX object > core/digikam/CMakeFiles/digikamcore.dir/__/libs/dimg/loaders/pngloader.cpp.o > /c/temp/kde/trunk-src/digikam-sc/core/libs/dimg/loaders/pngloader.cpp:61:21: > error: version.h: No such file or directory > > /c/temp/kde/trunk-src/digikam-sc/core/libs/dimg/loaders/pngloader.cpp: > In member function 'virtual bool Digikam::PNGLoader::save(const > QString&, Digikam::DImgLoaderObserver*)': > /c/temp/kde/trunk-src/digikam-sc/core/libs/dimg/loaders/pngloader.cpp:892: > error: 'digiKamVersion' was not declared in this scope > make[2]: *** > [core/digikam/CMakeFiles/digikamcore.dir/__/libs/dimg/loaders/pngloader.cpp.o] > Error 1 > make[1]: *** [core/digikam/CMakeFiles/digikamcore.dir/all] Error 2 > make: *** [all] Error 2 > > > Michael > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: digikam/digikam sub-folders created...
|
|
Hi,
I also have the same issue. In core/digikam/utils, I have only "version.h.cmake", but no "version.h". Gabriel On Thu, Feb 24, 2011 at 11:42 PM, Gilles Caulier <[hidden email]> wrote: Strange, all compile fine here. _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: digikam/digikam sub-folders created...
|
|
Clean CMakeCache.txt and try again...
Gilles 2011/2/25 Gabriel Voicu <[hidden email]>: > Hi, > > I also have the same issue. In core/digikam/utils, I have only > "version.h.cmake", but no "version.h". > > Gabriel > > On Thu, Feb 24, 2011 at 11:42 PM, Gilles Caulier <[hidden email]> > wrote: >> >> Strange, all compile fine here. >> >> version.h is created in digikam/digikam/utils/ dir. File exist in you >> computer ? >> >> If yes, this want mean that include path is not turned on with >> digikam/digikam/utils/. This is strange because it already set in >> digikam/CMakeLists.txt file at line 1405... >> >> Gilles >> >> 2011/2/24 Michael G. Hansen <[hidden email]>: >> > On 02/24/2011 10:54 AM, Gilles Caulier wrote: >> >> Let's me hear if all is fine for you, and if alll compile fine of >> >> course. >> > >> > Without the test building option, compilation fails here (I reset the >> > build directory before recompiling): >> > >> > [ 52%] Building CXX object >> > >> > core/digikam/CMakeFiles/digikamcore.dir/__/libs/dimg/loaders/pngloader.cpp.o >> > >> > /c/temp/kde/trunk-src/digikam-sc/core/libs/dimg/loaders/pngloader.cpp:61:21: >> > error: version.h: No such file or directory >> > >> > /c/temp/kde/trunk-src/digikam-sc/core/libs/dimg/loaders/pngloader.cpp: >> > In member function 'virtual bool Digikam::PNGLoader::save(const >> > QString&, Digikam::DImgLoaderObserver*)': >> > >> > /c/temp/kde/trunk-src/digikam-sc/core/libs/dimg/loaders/pngloader.cpp:892: >> > error: 'digiKamVersion' was not declared in this scope >> > make[2]: *** >> > >> > [core/digikam/CMakeFiles/digikamcore.dir/__/libs/dimg/loaders/pngloader.cpp.o] >> > Error 1 >> > make[1]: *** [core/digikam/CMakeFiles/digikamcore.dir/all] Error 2 >> > make: *** [all] Error 2 >> > >> > >> > Michael >> > _______________________________________________ >> > Digikam-devel mailing list >> > [hidden email] >> > https://mail.kde.org/mailman/listinfo/digikam-devel >> > >> _______________________________________________ >> Digikam-devel mailing list >> [hidden email] >> https://mail.kde.org/mailman/listinfo/digikam-devel > > > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel > > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: digikam/digikam sub-folders created...
|
|
I think I understood why it fails.
The version.h is created in :\KDev\dk\build\core\digikam\utils\version.h The patch file generated does not have -I for that path but only for -IC:\KDev\dk\core\digikam\utils When I copied the files to C:\KDev\dk\core\digikam\utils the build goes futher Gert On 25 February 2011 18:02, Gilles Caulier <[hidden email]> wrote: > Clean CMakeCache.txt and try again... > > Gilles _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: digikam/digikam sub-folders created...
|
|
Yes, if I copy version.h and gitversion.h in core/digikam/utils it's working for me also. Thanks!
On Fri, Feb 25, 2011 at 8:40 PM, Gert Kello <[hidden email]> wrote: I think I understood why it fails. _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: digikam/digikam sub-folders created...
|
|
Unfortunately, the compile stops again...
[ 61%] Building CXX object core/digikam/CMakeFiles/digikamcore.dir/__/libs/database/thumbnailschemaupdater.cpp.o
[ 61%] Building CXX object core/digikam/CMakeFiles/digikamcore.dir/__/libs/database/databaseconfigelement.cpp.o /home/gabi/workspace/digikam_git/digikam-software-compilation/core/libs/database/databaseconfigelement.cpp:45:29: error: dbconfigversion.h: No such file or directory
/home/gabi/workspace/digikam_git/digikam-software-compilation/core/libs/database/databaseconfigelement.cpp: In member function ‘bool Digikam::DatabaseConfigElementLoader::readConfig()’: /home/gabi/workspace/digikam_git/digikam-software-compilation/core/libs/database/databaseconfigelement.cpp:260: error: ‘dbconfig_xml_version’ was not declared in this scope
/home/gabi/workspace/digikam_git/digikam-software-compilation/core/libs/database/databaseconfigelement.cpp:266: error: ‘dbconfig_xml_version’ was not declared in this scope make[2]: *** [core/digikam/CMakeFiles/digikamcore.dir/__/libs/database/databaseconfigelement.cpp.o] Error 1
make[1]: *** [core/digikam/CMakeFiles/digikamcore.dir/all] Error 2 make: *** [all] Error 2 Gabriel On Fri, Feb 25, 2011 at 9:07 PM, Gabriel Voicu <[hidden email]> wrote: Yes, if I copy version.h and gitversion.h in core/digikam/utils it's working for me also. Thanks! _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: digikam/digikam sub-folders created...
|
|
The following diff seems to fix build:
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f93cc5..38299f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1508,6 +1508,12 @@ IF(DIGIKAM_CAN_BE_COMPILED) # config-digikam.h ${CMAKE_CURRENT_BINARY_DIR} + #version.h + ${CMAKE_CURRENT_BINARY_DIR}/digikam/utils + + #dbconfigversion.h + ${CMAKE_CURRENT_BINARY_DIR}/digikam/database + # external library paths ${JPEG_INCLUDE_DIR} ${PNG_PNG_INCLUDE_DIR} On 25 February 2011 21:29, Gabriel Voicu <[hidden email]> wrote: > Unfortunately, the compile stops again... > [ 61%] Building CXX object > core/digikam/CMakeFiles/digikamcore.dir/__/libs/database/thumbnailschemaupdater.cpp.o > > > [ 61%] Building CXX object > core/digikam/CMakeFiles/digikamcore.dir/__/libs/database/databaseconfigelement.cpp.o > /home/gabi/workspace/digikam_git/digikam-software-compilation/core/libs/database/databaseconfigelement.cpp:45:29: > error: dbconfigversion.h: No such file or directory _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: digikam/digikam sub-folders created...
|
|
Hi,
On 02/26/2011 11:55 AM, Gert Kello wrote: > The following diff seems to fix build: > > diff --git a/CMakeLists.txt b/CMakeLists.txt > index 5f93cc5..38299f8 100644 > --- a/CMakeLists.txt > +++ b/CMakeLists.txt > @@ -1508,6 +1508,12 @@ IF(DIGIKAM_CAN_BE_COMPILED) > # config-digikam.h > ${CMAKE_CURRENT_BINARY_DIR} > > + #version.h > + ${CMAKE_CURRENT_BINARY_DIR}/digikam/utils > + > + #dbconfigversion.h > + ${CMAKE_CURRENT_BINARY_DIR}/digikam/database > + > # external library paths > ${JPEG_INCLUDE_DIR} > ${PNG_PNG_INCLUDE_DIR} > > Yes, this is the fix, I also figured this out a few minutes ago ;-). Gilles, I think you could only see this problem when you built digikam from scratch, because the old version.h and dbconfigversion.h files would still be in the old places in your build directory. Michael _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: digikam/digikam sub-folders created...
|
|
On Saturday 26 February 2011 12:13:27 Michael G. Hansen wrote:
> Hi, > > On 02/26/2011 11:55 AM, Gert Kello wrote: > > The following diff seems to fix build: > > > > diff --git a/CMakeLists.txt b/CMakeLists.txt > > index 5f93cc5..38299f8 100644 > > --- a/CMakeLists.txt > > +++ b/CMakeLists.txt > > @@ -1508,6 +1508,12 @@ IF(DIGIKAM_CAN_BE_COMPILED) > > > > # config-digikam.h > > ${CMAKE_CURRENT_BINARY_DIR} > > > > + #version.h > > + ${CMAKE_CURRENT_BINARY_DIR}/digikam/utils > > + > > + #dbconfigversion.h > > + ${CMAKE_CURRENT_BINARY_DIR}/digikam/database > > + > > > > # external library paths > > ${JPEG_INCLUDE_DIR} > > ${PNG_PNG_INCLUDE_DIR} > > Yes, this is the fix, I also figured this out a few minutes ago ;-). > > Gilles, I think you could only see this problem when you built digikam > from scratch, because the old version.h and dbconfigversion.h files > would still be in the old places in your build directory. Yes, that sounds plausible. I have the same compile error and it's a fresh checkout. I didn't understand how to switch my existing workspace to the new layout and therefore checked it out fresh. Thanks for the patch! > > Michael > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: digikam/digikam sub-folders created...
|
|
In reply to this post by Michael G. Hansen
2011/2/26 Michael G. Hansen <[hidden email]>:
> Hi, > > On 02/26/2011 11:55 AM, Gert Kello wrote: >> The following diff seems to fix build: >> >> diff --git a/CMakeLists.txt b/CMakeLists.txt >> index 5f93cc5..38299f8 100644 >> --- a/CMakeLists.txt >> +++ b/CMakeLists.txt >> @@ -1508,6 +1508,12 @@ IF(DIGIKAM_CAN_BE_COMPILED) >> # config-digikam.h >> ${CMAKE_CURRENT_BINARY_DIR} >> >> + #version.h >> + ${CMAKE_CURRENT_BINARY_DIR}/digikam/utils >> + >> + #dbconfigversion.h >> + ${CMAKE_CURRENT_BINARY_DIR}/digikam/database >> + >> # external library paths >> ${JPEG_INCLUDE_DIR} >> ${PNG_PNG_INCLUDE_DIR} >> >> > > Yes, this is the fix, I also figured this out a few minutes ago ;-). > > Gilles, I think you could only see this problem when you built digikam > from scratch, because the old version.h and dbconfigversion.h files > would still be in the old places in your build directory. > > Michael Well, no. because, i already checkout all from scratch to test and all work fine here... Gilles _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
«
Return to digikam-devel
|
1 view|%1 views
| Free forum by Nabble | Edit this page |