aboutsummaryrefslogtreecommitdiff
path: root/modules/KDE4Macros.cmake
AgeCommit message (Collapse)Author
2006-03-19Fix install iconsLaurent Montel
now use install(FILES... RENAME...) => make install DESTDIR=<foo> works svn path=/trunk/KDE/kdelibs/; revision=520364
2006-03-18generate the files in CURRENT_BINARY_DIR againAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=520067
2006-03-18-don't generate any files in the source tree, but only in the build treeAlexander Neundorf
Laurent, where did this cause problems ? Was this with the files where source files with the same base names are now compiled to the same target, and beforfe with libtool one of them was part of a convenience libs ? Now that we don't use convenience libs anymore, this means that if two source files have the same basename, they will generate moc files with the same name, also for ui-files. What can we do about this ? If two files have the same names, maybe the name is too generic, so let's rename one of them to a more specialized name, especially now that we have svn. But generating files is the source-tree is a no-no. CCMAIL: montel@kde.org svn path=/trunk/KDE/kdelibs/; revision=520047
2006-03-18Generate file into own directoryLaurent Montel
svn path=/trunk/KDE/kdelibs/; revision=520043
2006-03-16-implemented RPATH handling, set RPATH_STYLE to one of the following:Alexander Neundorf
default: compile with RPATH to the builddir, when installing link again with RPATH to the install dir, the kde lib dir and the Qt lib dir none: no RPATH at all install: compile with RPATH to the install dir, the kde lib dir and the Qt lib dir both: compiel with RPATH to the build dir, the install dir, the kde lib dir and the Qt lib dir -sync kde3 stuff with cmake cvs -fix building if kdewidgets and kstyles (get_target_properties doesn't work before the target is defined) Alex svn path=/trunk/KDE/kdelibs/; revision=519312
2006-03-16Generate file into own directoryLaurent Montel
svn path=/trunk/KDE/kdelibs/; revision=519132
2006-03-16Generate files from ui3 into own directoryLaurent Montel
svn path=/trunk/KDE/kdelibs/; revision=519127
2006-03-16Generate moc file into own directoryLaurent Montel
Fix some bug when we lonk with no-install lib svn path=/trunk/KDE/kdelibs/; revision=519125
2006-03-11Fix generate file space into "kcfg" fileLaurent Montel
svn path=/trunk/KDE/kdelibs/; revision=517557
2006-03-08-apply patch by Andreas Beckermann for KDE 3 stuffAlexander Neundorf
-prepare UsePkgconfig for moving to cmake Alex svn path=/trunk/KDE/kdelibs/; revision=516854
2006-03-07-implemented RPATH handling, but disabled for nowAlexander Neundorf
to enable it again, remove the line 104, where KDE4_NEED_WRAPPER_SCRIPTS is set to false again If you have current cmake cvs, you can then: -enable CMAKE_SKIP_RPATH using ccmake, then everything will be built without RPATH -disable CMAKE_SKIP_RPATH and enable KDE4_RPATH_TO_BUILD_DIR, then everything will be built with RPATH pointing to both the build and the install dir -disable CMAKE_SKIP_RPATH and disable KDE4_RPATH_TO_BUILD_DIR, then everything will be built with RPATH pointing to the install dir In all three cases no relinking will happen during install. If built without RPATH to the builddir, the executables are executed using wrapper scripts named <name>.sh, e.g. kconfig_compiler.sh. some changes to the kde3 stuff: -renamed KDE3_ADD_KLM to KDE3_ADD_KDEINIT_EXECUTABLE -removed KDE3_PLACEHOLDER -removed KDE3_CREATE_LIBTOOL_FILE to KDE3_INSTALL_LIBTOOL_FILE Please check whether it still works for you and let me know. I plan to move the KDE3 related files to cmake RSN. CCMAIL: kde-buildsystem@kde.org CCMAIL: b_mann@gmx.de CCMAIL: christian.loose@hamburg.de Alex svn path=/trunk/KDE/kdelibs/; revision=516642
2006-02-18-renamed the KDE4_something_DIR to something_INSTALL_DIRAlexander Neundorf
except KDE4_INCLUDE_DIR, since this is used for compiling and not for installing -change the detection of KDE4_MODULE_DIR to use CMAKE_CURRENT_LIST_FILE I could not commit to kio/kssl/kssl/, so this may break installing there Alex CCMAIL: kde-buildsystem@kde.org CCMAIL: montel@kde.org svn path=/trunk/KDE/kdelibs/; revision=510826
2006-02-17after discussion with David:Alexander Neundorf
-renamed KDE4_ICON_DIR to ICON_INSTALL_DIR -changed KDE4_INSTALL_ICONS(theme dir) to KDE4_INSTALL_ICONS( dir theme) and dir now has to contain the "/icons" subdir, it is NOT appended anymore in the KDE4_INSTALL_ICONS() macro CCMAIL: montel@kde.org Alex svn path=/trunk/KDE/kdelibs/; revision=510673 The following changes were in SVN, but were removed from git: M pics/crystalsvg/CMakeLists.txt M pics/hicolor/CMakeLists.txt
2006-02-17-give kdelibs a project name ("kdelibs")Alexander Neundorf
-remove the unused "install_icon" targets -mark more variables as "ADVANCED" Alex svn path=/trunk/KDE/kdelibs/; revision=510649
2006-02-15on windows the plugins also need the MAKE_X_LIB macroPeter Kümmel
CCMAIL:neundorf@kde.org svn path=/trunk/KDE/kdelibs/; revision=509782
2006-02-15Reverting - generating moc files in subdirs worked, but this broke ↵David Faure
compilation because the subdir (in the builddir) is missing from the -I. How could we add it? (E.g. kdelibs/kio/kfile/kopenwith.cpp is compiled from kdelibs/kio, so the relative path to the header is kfile/kopenwith.h, and this created a kfile/kopenwith.moc, but it's included as "kopenwith.moc" from kopenwith.h so we need -Ikfile in the compilation line. This is necessary for the kabc/addressbook.h vs kabc/kab/addressbook.h case) CCMAIL: kde-buildsystem@kde.org svn path=/trunk/KDE/kdelibs/; revision=509646
2006-02-15When creating a moc file for foo/bar.h, create it as foo/bar.mocDavid Faure
This solves a problem in kabc which has addressbook.h and kab/addressbook.h, and looks more logical in e.g. kio with all its subdirs. svn path=/trunk/KDE/kdelibs/; revision=509637
2006-02-15not my dayDavid Faure
svn path=/trunk/KDE/kdelibs/; revision=509626
2006-02-15Hmm, "NOT" can't be lowercased. I tested before lowercasing that last one, ↵David Faure
of course... svn path=/trunk/KDE/kdelibs/; revision=509625
2006-02-15Lowercase some common keywords to improve readabilityDavid Faure
svn path=/trunk/KDE/kdelibs/; revision=509624
2006-02-13-added project(name-of_project) commands, so now when using the KDevelop3 ↵Alexander Neundorf
generator you will have ready-to-use kdevelop projects :-) ...may have problems with out-of-source builds (requires changes in kdevelop) Alex svn path=/trunk/KDE/kdelibs/; revision=509123
2006-02-12-moved the cmake code to find kdewin32 out of FindKDE4.cmake and into its ↵Alexander Neundorf
own FindKDEWIN32.cmake file -added a new FindGNUWIN32.cmake file, which tries to find the gnuwin32 base directory -changed all "FOO_LIBRARY" variable names to "FOO_LIBRARIES" to be more consistent with the other cmake modules -added a macro_getenv_win_path() which replaces all backslahes with slashes from environment variables -modified the kde4_add_kcfg_files() command, so that the generated header is also processed by moc -all tests compile and link Alex CCMAIL:kde-buildsystem@kde.org The changes to the windows stuff are untested, since I don't have a windows box. Please check that everything still works. Please have a look at FindGNUWIN32.cmake, there are probably ways to improve this. The resulting GNUWIN32_DIR variable is used in other cmake modules as default path to search for headers and libraries. svn path=/trunk/KDE/kdelibs/; revision=508648
2006-02-11-changed kde4_create_libtool_file (target dir_relative_to_libdir) Alexander Neundorf
to kde4_install_libtool_file(dir_relative_to_install_prefix target) -added variable KDE4_PLUGIN_INSTALL_DIR, used usually for installing plugins -changed am2cmake accordingly -edited FindLibXml2.cmake and FindLibArt so that they work correctly with CMAKE_INSTALL_PATH -changed generated_findpackage_file accordingly -some minor formatting changes Alex CCMAIL: montel@kde.org svn path=/trunk/KDE/kdelibs/; revision=508458
2006-02-11now cmake 2.3.3 is required, if you have an older version, you get a warningAlexander Neundorf
KDE cmake files are now workaround-free (if I didn't forget any): -use GET_FILENAME_COMPONENT(... ABSOLUTE) instead of QT4_GET_ABS_PATH() -use the new EXECUTE_PROCESS() instead of EXEC_PROGRAM() which discards stderr output -use check_symbol_exists() instead of check_function_exists() since this works better (mainly various windows issues) -use the new WORKING_DIRECTORY argument for ADD_CUSTOM_COMMAND() instead of cmake -E chdir ... Alex svn path=/trunk/KDE/kdelibs/; revision=508407
2006-02-09-move find_package(pcre) back to kdelibs/CMakeLists.txt, otherwise ↵Alexander Neundorf
HAVE_PCREPOSIX doesn't get set -use qPrintable() in kded/kbuildsycoca.cpp patches by Brad King: -fix stat.h for mingw -fix typo in FindQt4.cmake -only depend on dcopidl2ccp and kconfig_compiler when compiling kdelibs Alex svn path=/trunk/KDE/kdelibs/; revision=507620
2006-02-08-remove macro_append_directory_properties() and add ↵Alexander Neundorf
macro_additional_clean_files() -remove macro_append_source_files_properties() and add macro_add_file_dependencies() -build kICE as a static library and link to it, instead of including the sources multiple times -remove the -kdemain=main from dcop/, hope this didn't break things on windows some patches from Brad King: -rename the target dcop (the executable) to dcop_executable, otherwise MS Visual Studio complains about multiple targets with the same name , the name of the created executable stays "dcop" -add the dependency of all dcop stubs and skels to dcopidl2cpp, to make sure it is compiled before this rule is executed Alex svn path=/trunk/KDE/kdelibs/; revision=507257
2006-02-07make everything cleanAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=506938
2006-02-07two new macros: macro_append_directory_properties() and ↵Alexander Neundorf
macro_append_source_files_properties() don't use CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH in FindKDE4.cmake clean more files Alex svn path=/trunk/KDE/kdelibs/; revision=506927
2006-02-07Now we specify lib dirLaurent Montel
now we can specify /usr/lib directory and not jsut usr/lib/kde4 for la lib (necessary for .la installed into /usr/lib) svn path=/trunk/KDE/kdelibs/; revision=506650
2006-02-07Now we can install .la lib into good directoryLaurent Montel
before it installed la lib just in /usr/lib/kde4 svn path=/trunk/KDE/kdelibs/; revision=506638
2006-02-05-fix the generation of the la-files for out-of-source buildsAlexander Neundorf
-fix the klockfile test Alex svn path=/trunk/KDE/kdelibs/; revision=506092
2006-02-04-renamed optional_find_package() to macro_optional_find_package(), to make ↵Alexander Neundorf
it clear it is a macro and not a builtin command -kjsembed compiles -CheckCXXSourceCompiles now support multiple include paths -compile fix in kjsembed/value_binding.cpp: prefer the local global.h, otherwise it might end up with the global.h from kio/kio/, depending on the order of include directories -use the new "-o" switch for dcopidl -add a (temporary) workaround for David's uic problem Alex svn path=/trunk/KDE/kdelibs/; revision=505580 The following changes were in SVN, but were removed from git: M pics/CMakeLists.txt
2006-02-04Now icons installed correctly Laurent Montel
svn path=/trunk/KDE/kdelibs/; revision=505535
2006-02-04Fix install icon in good directoryLaurent Montel
svn path=/trunk/KDE/kdelibs/; revision=505485 The following changes were in SVN, but were removed from git: M pics/crystalsvg/CMakeLists.txt M pics/hicolor/CMakeLists.txt
2006-02-03more fixes for windows... Alexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=505471
2006-02-03for now the kdeinit stuff is also required on windows, make compiling easier ↵Alexander Neundorf
for now fix typo in mingw section Alex svn path=/trunk/KDE/kdelibs/; revision=505460
2006-02-03-major overhaul of the windows stuff: kdelibs/win/ is now built as a regular ↵Alexander Neundorf
part of the build process -an improved version of CheckIncludeFiles.cmake has been added, which takes additional include directories as argument -the check for the KDE4_LIB_DIR was wrong, it returned libkxmlcore.so instead of the directory -fix the header install commands for the win/include/ stuff Alex svn path=/trunk/KDE/kdelibs/; revision=505455
2006-02-03Install scalable iconsLaurent Montel
svn path=/trunk/KDE/kdelibs/; revision=505212
2006-02-02-use the expected -DMAKE_<libname>_LIB when compiling libraries under windowsAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=504990
2006-02-02correct path also in the la fileAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=504940
2006-02-02install the fake libtool la files also to KDE4_LIB_INSTALL_DIRAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=504937
2006-02-02Allow to compile java directoryLaurent Montel
(install doesn't work for the moment ) svn path=/trunk/KDE/kdelibs/; revision=504910
2006-01-25-all install rules work nowAlexander Neundorf
-DartConfig.cmake contributed by Bill Hoffman Alex svn path=/trunk/KDE/kdelibs/; revision=502405
2006-01-25add the stuff moved from kdesdk, maybe...Alexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=502383
2006-01-23make it dcop skel/stub rules work in directories where stubs/skels areAlexander Neundorf
generated multiple times for the same headers Alex svn path=/trunk/KDE/kdesdk/cmake/; revision=501726
2006-01-22it seems strtoll doesn't work opn FreeBSD with -ansiAlexander Neundorf
Alex svn path=/trunk/KDE/kdesdk/cmake/; revision=501434
2006-01-22-kde4 stuff moved to modules/ dirAlexander Neundorf
Alex svn path=/trunk/KDE/kdesdk/cmake/; revision=501378