From fb0d05a8363b1f37c24f995b9565cb90c8625256 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 4 Feb 2006 12:15:29 +0000 Subject: -renamed optional_find_package() to macro_optional_find_package(), to make 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 --- modules/MacroLibrary.cmake | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 modules/MacroLibrary.cmake (limited to 'modules/MacroLibrary.cmake') diff --git a/modules/MacroLibrary.cmake b/modules/MacroLibrary.cmake new file mode 100644 index 00000000..25abc38d --- /dev/null +++ b/modules/MacroLibrary.cmake @@ -0,0 +1,5 @@ +# - include MacroLibrary offers a collection of macros which extend the built-in cmake commands +# OPTIONAL_FIND_PACKAGE( [QUIT] ) + +INCLUDE (MacroOptionalFindPackage) + -- cgit v1.2.1 From fce52d437088520993f5f0df591408aa7e8e6eb4 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 7 Feb 2006 21:49:31 +0000 Subject: two new macros: macro_append_directory_properties() and 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 --- modules/MacroLibrary.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'modules/MacroLibrary.cmake') diff --git a/modules/MacroLibrary.cmake b/modules/MacroLibrary.cmake index 25abc38d..337a1087 100644 --- a/modules/MacroLibrary.cmake +++ b/modules/MacroLibrary.cmake @@ -2,4 +2,6 @@ # OPTIONAL_FIND_PACKAGE( [QUIT] ) INCLUDE (MacroOptionalFindPackage) +INCLUDE (MacroAppendDirectoryProperties) +INCLUDE (MacroAppendSourceFilesProperties) -- cgit v1.2.1 From 8da037b9c177dc8055725beac87841f10d4ae80f Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Wed, 8 Feb 2006 20:34:09 +0000 Subject: -remove macro_append_directory_properties() and add 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 --- modules/MacroLibrary.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'modules/MacroLibrary.cmake') diff --git a/modules/MacroLibrary.cmake b/modules/MacroLibrary.cmake index 337a1087..f82a5db8 100644 --- a/modules/MacroLibrary.cmake +++ b/modules/MacroLibrary.cmake @@ -2,6 +2,8 @@ # OPTIONAL_FIND_PACKAGE( [QUIT] ) INCLUDE (MacroOptionalFindPackage) -INCLUDE (MacroAppendDirectoryProperties) -INCLUDE (MacroAppendSourceFilesProperties) +INCLUDE (MacroAdditionalCleanFiles) +INCLUDE (MacroAddFileDependencies) +#INCLUDE (MacroAppendDirectoryProperties) +#INCLUDE (MacroAppendSourceFilesProperties) -- cgit v1.2.1 From 75a07dd38b4a491a9d16d24492bea5c6ba90a8ff Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 12 Feb 2006 14:38:04 +0000 Subject: -moved the cmake code to find kdewin32 out of FindKDE4.cmake and into its 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 --- modules/MacroLibrary.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'modules/MacroLibrary.cmake') diff --git a/modules/MacroLibrary.cmake b/modules/MacroLibrary.cmake index f82a5db8..7da67217 100644 --- a/modules/MacroLibrary.cmake +++ b/modules/MacroLibrary.cmake @@ -4,6 +4,5 @@ INCLUDE (MacroOptionalFindPackage) INCLUDE (MacroAdditionalCleanFiles) INCLUDE (MacroAddFileDependencies) -#INCLUDE (MacroAppendDirectoryProperties) -#INCLUDE (MacroAppendSourceFilesProperties) +INCLUDE (MacroGetenvWinPath) -- cgit v1.2.1 From 191846e3e21c697c28bd5c8a166edeb4072161e3 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Mon, 20 Mar 2006 21:05:37 +0000 Subject: minor cleanups: indenting, adding newline to end of file, etc. svn path=/trunk/KDE/kdelibs/; revision=520790 --- modules/MacroLibrary.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/MacroLibrary.cmake') diff --git a/modules/MacroLibrary.cmake b/modules/MacroLibrary.cmake index 7da67217..fb953d85 100644 --- a/modules/MacroLibrary.cmake +++ b/modules/MacroLibrary.cmake @@ -1,8 +1,8 @@ # - include MacroLibrary offers a collection of macros which extend the built-in cmake commands # OPTIONAL_FIND_PACKAGE( [QUIT] ) -INCLUDE (MacroOptionalFindPackage) -INCLUDE (MacroAdditionalCleanFiles) -INCLUDE (MacroAddFileDependencies) -INCLUDE (MacroGetenvWinPath) +INCLUDE(MacroOptionalFindPackage) +INCLUDE(MacroAdditionalCleanFiles) +INCLUDE(MacroAddFileDependencies) +INCLUDE(MacroGetenvWinPath) -- cgit v1.2.1 From 1e0c87f062f076101762defc239585597bc7cf36 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 8 Apr 2006 12:03:57 +0000 Subject: -add GENERIC_LIB_VERSION and GENERIC_LIB_SOVERSION in KDE4Defaults.cmake, so we can easily adjust the version number of our libs for each release Alex svn path=/trunk/KDE/kdelibs/; revision=527474 --- modules/MacroLibrary.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/MacroLibrary.cmake') diff --git a/modules/MacroLibrary.cmake b/modules/MacroLibrary.cmake index fb953d85..8a4e52e4 100644 --- a/modules/MacroLibrary.cmake +++ b/modules/MacroLibrary.cmake @@ -5,4 +5,5 @@ INCLUDE(MacroOptionalFindPackage) INCLUDE(MacroAdditionalCleanFiles) INCLUDE(MacroAddFileDependencies) INCLUDE(MacroGetenvWinPath) +INCLUDE(MacroEnsureOutOfSourceBuild) -- cgit v1.2.1 From e3aa5b879ff9339b77532721df7bdc74348b676f Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 1 May 2006 11:54:15 +0000 Subject: -add a macro to convert the value of cmake variables to 0 or 1 for use in config.h.cmake Alex svn path=/trunk/KDE/kdelibs/; revision=536102 --- modules/MacroLibrary.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/MacroLibrary.cmake') diff --git a/modules/MacroLibrary.cmake b/modules/MacroLibrary.cmake index 8a4e52e4..517141e9 100644 --- a/modules/MacroLibrary.cmake +++ b/modules/MacroLibrary.cmake @@ -6,4 +6,4 @@ INCLUDE(MacroAdditionalCleanFiles) INCLUDE(MacroAddFileDependencies) INCLUDE(MacroGetenvWinPath) INCLUDE(MacroEnsureOutOfSourceBuild) - +INCLUDE(MacroBoolTo01) -- cgit v1.2.1 From 700906bdeb7042b1584800877b5d6bc3ba702027 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 5 Jun 2006 16:47:04 +0000 Subject: remove MacroGetenvWinPath.cmake, this is not required anymore since cmake 2.4.1 Alex svn path=/trunk/KDE/kdelibs/; revision=548477 --- modules/MacroLibrary.cmake | 1 - 1 file changed, 1 deletion(-) (limited to 'modules/MacroLibrary.cmake') diff --git a/modules/MacroLibrary.cmake b/modules/MacroLibrary.cmake index 517141e9..ce741f7b 100644 --- a/modules/MacroLibrary.cmake +++ b/modules/MacroLibrary.cmake @@ -4,6 +4,5 @@ INCLUDE(MacroOptionalFindPackage) INCLUDE(MacroAdditionalCleanFiles) INCLUDE(MacroAddFileDependencies) -INCLUDE(MacroGetenvWinPath) INCLUDE(MacroEnsureOutOfSourceBuild) INCLUDE(MacroBoolTo01) -- cgit v1.2.1 From f20cd1e4876fe5277f42e54561690495cb24d417 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 18 Jun 2006 18:58:23 +0000 Subject: -macro_push_required_vars() and macro_pop_required_vars() for guarding cmake's check_something_exists() macros Alex svn path=/trunk/KDE/kdelibs/; revision=552675 --- modules/MacroLibrary.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/MacroLibrary.cmake') diff --git a/modules/MacroLibrary.cmake b/modules/MacroLibrary.cmake index ce741f7b..c4006c27 100644 --- a/modules/MacroLibrary.cmake +++ b/modules/MacroLibrary.cmake @@ -6,3 +6,4 @@ INCLUDE(MacroAdditionalCleanFiles) INCLUDE(MacroAddFileDependencies) INCLUDE(MacroEnsureOutOfSourceBuild) INCLUDE(MacroBoolTo01) +INCLUDE(MacroPushRequiredVars) -- cgit v1.2.1 From 625cdcf8bf06301996e4895649312cf9eba4cc96 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 2 Jul 2006 08:14:42 +0000 Subject: -remove the old makefile.am contents from the cmake files in kdelibs -add MacroLogFeature.cmake to the MacroLibrary Alex svn path=/trunk/KDE/kdelibs/; revision=557030 The following changes were in SVN, but were removed from git: M pics/CMakeLists.txt M pics/crystalsvg/CMakeLists.txt M pics/emoticons/CMakeLists.txt M pics/hicolor/CMakeLists.txt --- modules/MacroLibrary.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/MacroLibrary.cmake') diff --git a/modules/MacroLibrary.cmake b/modules/MacroLibrary.cmake index c4006c27..c2a3e8d9 100644 --- a/modules/MacroLibrary.cmake +++ b/modules/MacroLibrary.cmake @@ -7,3 +7,4 @@ INCLUDE(MacroAddFileDependencies) INCLUDE(MacroEnsureOutOfSourceBuild) INCLUDE(MacroBoolTo01) INCLUDE(MacroPushRequiredVars) +INCLUDE(MacroLogFeature) -- cgit v1.2.1 From 9f7b06796282c204663c3c1f75ce85057430e34b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Sun, 20 Aug 2006 13:48:13 +0000 Subject: new macros macro_add_{compile,link}_flags(target "flags ...") svn path=/trunk/KDE/kdelibs/; revision=574886 --- modules/MacroLibrary.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'modules/MacroLibrary.cmake') diff --git a/modules/MacroLibrary.cmake b/modules/MacroLibrary.cmake index c2a3e8d9..d45414a5 100644 --- a/modules/MacroLibrary.cmake +++ b/modules/MacroLibrary.cmake @@ -4,6 +4,8 @@ INCLUDE(MacroOptionalFindPackage) INCLUDE(MacroAdditionalCleanFiles) INCLUDE(MacroAddFileDependencies) +INCLUDE(MacroAddCompileFlags) +INCLUDE(MacroAddLinkFlags) INCLUDE(MacroEnsureOutOfSourceBuild) INCLUDE(MacroBoolTo01) INCLUDE(MacroPushRequiredVars) -- cgit v1.2.1 From c778596920e0d5357f216c885e35b4f97d371a23 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 9 Sep 2006 10:18:35 +0000 Subject: added copyright notice everywhere. Now they all are BSD-licensed, as copyright holder I inserted everywhere the one who added it to svn (or Kitware if it is an enhanced copy from taken cmake) Some developers committed quite often but were not the ones who added the file, if you feel you have also copyright on the file add your name in the specific file. Copyright holders: CCMAIL: montel@kde.org CCMAIL: toscano.pino@tiscali.it CCMAIL: adymo@kdevelop.org CCMAIL: ranger@befunk.com CCMAIL: zack@kde.org CCMAIL: caslav.ilic@gmx.net CCMAIL: syntheticpp@yahoo.com CCMAIL: js@iidea.pl CCMAIL: michael.larouche@kdemail.net CCMAIL: ossi@kde.org CCMAIL: faure@kde.org Committers, but no files added so that they are not listed as copyright holders: CCMAIL: ch.ehrlicher@gmx.de CCMAIL: winter@kde.org CCMAIL: ralf.habacker@freenet.de CCMAIL: moura@kdewebdev.org CCMAIL: kde-buildsystem@kde.org Alex svn path=/trunk/KDE/kdelibs/; revision=582410 --- modules/MacroLibrary.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'modules/MacroLibrary.cmake') diff --git a/modules/MacroLibrary.cmake b/modules/MacroLibrary.cmake index d45414a5..59836927 100644 --- a/modules/MacroLibrary.cmake +++ b/modules/MacroLibrary.cmake @@ -1,6 +1,11 @@ # - include MacroLibrary offers a collection of macros which extend the built-in cmake commands # OPTIONAL_FIND_PACKAGE( [QUIT] ) +# Copyright (c) 2006, Alexander Neundorf, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + INCLUDE(MacroOptionalFindPackage) INCLUDE(MacroAdditionalCleanFiles) INCLUDE(MacroAddFileDependencies) -- cgit v1.2.1 From 6bcd26467abb252ca269faad4ae2131566531ce0 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 20 Jan 2007 13:28:47 +0000 Subject: Added new macro MACRO_OPTIONAL_ADD_SUBDIRECTORY(dir), which might be useful e.g. for extragear. If you use this instead of the normal ADD_SUBDIRECTORY(), it adds for every directory an option so you can skip this directory, and it doesn't complain if the directory doesn't exist. E.g. if you want to compile just one project from the extragear or kdesupport you can turn the other dirs off if you use this macro instead of the normal ADD_SUBDIRECTORY() Alex CCMAIL: kde-core-devel@kde.org CCMAIL: kde-buildsystem@kde.org svn path=/trunk/KDE/kdelibs/; revision=625574 --- modules/MacroLibrary.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/MacroLibrary.cmake') diff --git a/modules/MacroLibrary.cmake b/modules/MacroLibrary.cmake index 59836927..3b802126 100644 --- a/modules/MacroLibrary.cmake +++ b/modules/MacroLibrary.cmake @@ -7,6 +7,7 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. INCLUDE(MacroOptionalFindPackage) +INCLUDE(MacroOptionalAddSubdirectory) INCLUDE(MacroAdditionalCleanFiles) INCLUDE(MacroAddFileDependencies) INCLUDE(MacroAddCompileFlags) -- cgit v1.2.1 From 095470941e9a5c481ee9736e802052bd390c505f Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 16 Dec 2007 13:19:46 +0000 Subject: new macro MACRO_APPEND_IF(var condition value1..valuen) can be used to simplify code: macro_append_if(mySrcs SOMELIB_FOUND file1.cpp file2.cpp) instead of if(SOMELIB_FOUND) set(mySrcs file1.cpp file2.cpp) endif(SOMELIB_FOUND) Alex svn path=/trunk/KDE/kdelibs/; revision=749077 --- modules/MacroLibrary.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/MacroLibrary.cmake') diff --git a/modules/MacroLibrary.cmake b/modules/MacroLibrary.cmake index 3b802126..5e482f92 100644 --- a/modules/MacroLibrary.cmake +++ b/modules/MacroLibrary.cmake @@ -1,5 +1,4 @@ # - include MacroLibrary offers a collection of macros which extend the built-in cmake commands -# OPTIONAL_FIND_PACKAGE( [QUIT] ) # Copyright (c) 2006, Alexander Neundorf, # @@ -12,6 +11,7 @@ INCLUDE(MacroAdditionalCleanFiles) INCLUDE(MacroAddFileDependencies) INCLUDE(MacroAddCompileFlags) INCLUDE(MacroAddLinkFlags) +INCLUDE(MacroAppendIf) INCLUDE(MacroEnsureOutOfSourceBuild) INCLUDE(MacroBoolTo01) INCLUDE(MacroPushRequiredVars) -- cgit v1.2.1 From 728a5895ce2bd160b3a8748ee15711d942d62ebb Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 14 Dec 2008 23:11:35 +0000 Subject: -rename the new kde4_write_basic_cmake_version_file() to macro_write_basic_cmake_version_file(), since it is completely KDE-independent and can potentially be used in any other project remove the old macro, add the new renamed one, add it to the macro library, adjust kdepimlibs/CMakeLists.txt accordingly Alex svn path=/trunk/KDE/kdelibs/; revision=896999 --- modules/MacroLibrary.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/MacroLibrary.cmake') diff --git a/modules/MacroLibrary.cmake b/modules/MacroLibrary.cmake index 5e482f92..a467d840 100644 --- a/modules/MacroLibrary.cmake +++ b/modules/MacroLibrary.cmake @@ -16,3 +16,4 @@ INCLUDE(MacroEnsureOutOfSourceBuild) INCLUDE(MacroBoolTo01) INCLUDE(MacroPushRequiredVars) INCLUDE(MacroLogFeature) +INCLUDE(MacroWriteBasicCMakeVersionFile) -- cgit v1.2.1