aboutsummaryrefslogtreecommitdiff
path: root/modules/KDE4Macros.cmake
AgeCommit message (Collapse)Author
2006-04-26-add the multiple output to the dcop macrosAlexander Neundorf
-some lowercasing Alex svn path=/trunk/KDE/kdelibs/; revision=534320
2006-04-24-add the generated ui-headers to the list of sources, this helps with ↵Alexander Neundorf
creating the desired rules Alex svn path=/trunk/KDE/kdelibs/; revision=533383
2006-04-23-make the kdewidgets rule depend on makekdewidgets inside kdelibsAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=533083
2006-04-22-add docs for the NOGUI and RUN_UNINSTALLED options for KDE4_ADD_EXECUTABLE()Alexander Neundorf
-use the new multiple-output syntax for KDE4_ADD_KCFG_FILES() -introduce a new target property WRAPPER_SCRIPT, which is set to the created wrapper script (or the executable if none is generated), which can then be easily queried and used e.g. in add_custom_command Alex Adriaan, does this fix your RPATH problem ? CCMAIL: <groot@kde.org> svn path=/trunk/KDE/kdelibs/; revision=532800
2006-04-15Add makekdewidgets macro.Volker Krause
svn path=/trunk/KDE/kdelibs/; revision=530095
2006-04-09-better error handling in FindQt4.cmakeAlexander Neundorf
-use add_custom_command instead of add_custom_target(), saves one line of code Alex svn path=/trunk/KDE/kdelibs/; revision=527955
2006-04-08-generate the shell-wrappers for the executables during buildtime instead of ↵Alexander Neundorf
cmake time, and remove them when "cleaning" Alex svn path=/trunk/KDE/kdelibs/; revision=527599
2006-04-08-creating of the sh-wrappers now also works with empty EXECUTABLE_OUTPUT_PATHAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=527424
2006-04-07-fix link error in kdewidgetsAlexander Neundorf
-fix error in kate (the ui_ prefix was missing) -change RPATH handling once again: -renamed "TOOL" to "RUN_UNINSTALLED" RPATH_STYLE is gone if CMAKE_SKIP_RPATH is enabled, no RPATH will be used if it is enabled, all except the RUN_UNINSTALLED apps will be built with RPATH to the install dir, apps with RUN_UNINSTALLED set will be built with RPATH to the build dir, and relinked during make install Alex svn path=/trunk/KDE/kdelibs/; revision=527381
2006-04-07-in ADD_CUSTOM_COMMAND: use MAIN_DEPENDENCY, where the depend file is a file ↵Alexander Neundorf
which will not be compiled by the C/C++ compiler and use DEPENDS for everything else and where it's unsure whether it's a header or an implementation file this fixes the build in kdelibs/kdewidgets/ partly, now it breaks with "unknown interface" :-/ Alex svn path=/trunk/KDE/kdelibs/; revision=527355
2006-04-06-use the TOOL keyword for kconfig_compiler, genembed and makekdewidgetsAlexander Neundorf
ideally the keywords would be: one of RUN_FROM_BUILDTREE, RUN_UNINSTALLED, NOINST, BUILDTOO, TOOL - has to run from the buildtree without being installed NOGUI - bascially means "no bundle on OS X", so e.g. also for maybe kwin default (no keyword): build a bundle on OS X, compile with RPATH to the install dir Alex CCMAIL: kde-buildsystem@kde.org svn path=/trunk/KDE/kdelibs/; revision=527103
2006-04-06unset the bundle param if it is non-guiBenjamin Reed
svn path=/trunk/KDE/kdelibs/; revision=527038
2006-04-05Prefix generated header files with ui_ for designer4 ui files.Matthias Kretz
Adjust the includes accordingly (I hope I found all of them, at least kdelibs compiles here - except for kate/tests/arbitraryhighlighttest.cpp) Be careful when using foo.ui, foo.h, foo.cpp now, though because uic puts a very general include guard macro in the generated file: FOO_H Most people (and kde-devel-vim.vim's ,i) will use the same macro for foo.h. This will hopefully be fixable when Trolltech extends uic so that we don't have to postprocess the output anymore. (The -o option of uic creates the include guard from the name of the output file.) svn path=/trunk/KDE/kdelibs/; revision=526900
2006-04-05-add the NOGUI keyword to the KDE4_ADD_EXECUTABLE_CALLS()Alexander Neundorf
right now this only affects OS X: without the NOGUI keyword, now application bundles should be created I will add RPATH handling later. kdelibs/kabc/: add a dependency of addressee.h to addressee.cpp, this works partly (i.e. it works if none of both exists, but doesn't work if addressee.cpp exists and addressee.h doesn't) Alex CCMAIL: kde-buildsystem@kde.org svn path=/trunk/KDE/kdelibs/; revision=526894 The following changes were in SVN, but were removed from git: M pics/CMakeLists.txt
2006-04-05-add a KDE4Defaults.cmake to set default values and use this one in ↵Alexander Neundorf
kdelibs/CMakeLists.txt Alex svn path=/trunk/KDE/kdelibs/; revision=526864
2006-04-04Ooops remove line that got committed by mistake; more docu updates.David Faure
svn path=/trunk/KDE/kdelibs/; revision=526552
2006-04-04Fix docuDavid Faure
svn path=/trunk/KDE/kdelibs/; revision=526548
2006-04-04-listing the generated header file also in the list of sources can't hurtAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=526481
2006-04-04-tell cmake that kconfig_compiler produces both a header and an ↵Alexander Neundorf
implementation files, this should fix parallel builds Alex svn path=/trunk/KDE/kdelibs/; revision=526472
2006-04-03-prepare for the different executable types: default, "NOGUI" and "BUILDTOOL"Alexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=526097
2006-03-30Don't remove this file on make clean, it won't be re-generated by "make".David Faure
svn path=/trunk/KDE/kdelibs/; revision=524571
2006-03-22don't generate files in the source-treeAlexander Neundorf
Alex svn path=/trunk/KDE/kdelibs/; revision=521514
2006-03-20minor cleanups: indenting, adding newline to end of file, etc.Allen Winter
svn path=/trunk/KDE/kdelibs/; revision=520793
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