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/MacroOptionalFindPackage.cmake | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 modules/MacroOptionalFindPackage.cmake (limited to 'modules/MacroOptionalFindPackage.cmake') diff --git a/modules/MacroOptionalFindPackage.cmake b/modules/MacroOptionalFindPackage.cmake new file mode 100644 index 00000000..4ad64a41 --- /dev/null +++ b/modules/MacroOptionalFindPackage.cmake @@ -0,0 +1,16 @@ +# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION() +# MACRO_OPTIONAL_FIND_PACKAGE( [QUIT] ) +# This macro is a combination of OPTION() and FIND_PACKAGE(), it +# works like FIND_PACKAGE(), but additionally it automatically creates +# an option name WITH_, which can be disabled via the cmake GUI. +# or via -DWITH_=OFF +# The standard _FOUND variables can be used in the same way +# as when using the normal FIND_PACKAGE() + +MACRO(MACRO_OPTIONAL_FIND_PACKAGE _name ) + OPTION(WITH_${_name} "Search for ${_name} package" ON) + IF (WITH_${_name}) + FIND_PACKAGE(${_name} ${ARGN}) + ENDIF (WITH_${_name}) +ENDMACRO(MACRO_OPTIONAL_FIND_PACKAGE) + -- cgit v1.2.1 From c11fc5de759fa645e301e50fbb4e794c80d1a117 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 7 Feb 2006 20:16:28 +0000 Subject: -move the find_package(PCRE) from kdelibs/CMakeLists.txt to kdelibs/kjs/CMakeLists.txt -add a check for regex.h in kjs/CMakeLists.txt and error out if neither PCRE nor regex.h have been found build kdelibs/win independent from the rest of kdelibs/ this means 1) run cmake on kdelibs/win/ 2) make kdelibs/win 3) install kdelibs/win 4) run cmake in kdelibs/ -> point it to the place where kdewin32 has been installed to 5) make kdelibs/ 6) make install Peter, can you please check that kdelibs/win/ builds and also installs this way ? It might still be possible that somewhere stuff from kdelibs/ is included directly. Also eventually $ENV{MSSDK}/include might have to be added in kdelibs/win/ ConfigureChecksWin.cmake is not used anymore, we can remove it if it works this way. Please check also that kdelibs/ configures correctly again. It is required that the include dir of kdewin32 is set. If all the HAVE_FOO_PROTO checks still fail, please post the error messages from CMakeError.log Alex CCMAIL: kde-buildsystem@kde.org CCMAIL: syntheticpp@gmx.net CCMAIL: bill.hoffman@kitware.com svn path=/trunk/KDE/kdelibs/; revision=506872 --- modules/MacroOptionalFindPackage.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules/MacroOptionalFindPackage.cmake') diff --git a/modules/MacroOptionalFindPackage.cmake b/modules/MacroOptionalFindPackage.cmake index 4ad64a41..1b0cf1e7 100644 --- a/modules/MacroOptionalFindPackage.cmake +++ b/modules/MacroOptionalFindPackage.cmake @@ -11,6 +11,12 @@ MACRO(MACRO_OPTIONAL_FIND_PACKAGE _name ) OPTION(WITH_${_name} "Search for ${_name} package" ON) IF (WITH_${_name}) FIND_PACKAGE(${_name} ${ARGN}) + ELSE (WITH_${_name}) + SET(${_name}_FOUND) + SET(${_name}_INCLUDE_DIR) + SET(${_name}_INCLUDES) + SET(${_name}_LIBRARY) + SET(${_name}_LIBRARIES) ENDIF (WITH_${_name}) ENDMACRO(MACRO_OPTIONAL_FIND_PACKAGE) -- cgit v1.2.1 From ffc69376dc591eae7b0ed2e974a599fb1b8b2aa8 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 15 Feb 2006 10:47:36 +0000 Subject: Lowercase some common keywords to improve readability svn path=/trunk/KDE/kdelibs/; revision=509624 --- modules/MacroOptionalFindPackage.cmake | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'modules/MacroOptionalFindPackage.cmake') diff --git a/modules/MacroOptionalFindPackage.cmake b/modules/MacroOptionalFindPackage.cmake index 1b0cf1e7..c7a05cf0 100644 --- a/modules/MacroOptionalFindPackage.cmake +++ b/modules/MacroOptionalFindPackage.cmake @@ -9,14 +9,14 @@ MACRO(MACRO_OPTIONAL_FIND_PACKAGE _name ) OPTION(WITH_${_name} "Search for ${_name} package" ON) - IF (WITH_${_name}) + if (WITH_${_name}) FIND_PACKAGE(${_name} ${ARGN}) - ELSE (WITH_${_name}) - SET(${_name}_FOUND) - SET(${_name}_INCLUDE_DIR) - SET(${_name}_INCLUDES) - SET(${_name}_LIBRARY) - SET(${_name}_LIBRARIES) - ENDIF (WITH_${_name}) + else (WITH_${_name}) + set(${_name}_FOUND) + set(${_name}_INCLUDE_DIR) + set(${_name}_INCLUDES) + set(${_name}_LIBRARY) + set(${_name}_LIBRARIES) + endif (WITH_${_name}) ENDMACRO(MACRO_OPTIONAL_FIND_PACKAGE) -- 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/MacroOptionalFindPackage.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/MacroOptionalFindPackage.cmake') diff --git a/modules/MacroOptionalFindPackage.cmake b/modules/MacroOptionalFindPackage.cmake index c7a05cf0..70681312 100644 --- a/modules/MacroOptionalFindPackage.cmake +++ b/modules/MacroOptionalFindPackage.cmake @@ -7,7 +7,7 @@ # The standard _FOUND variables can be used in the same way # as when using the normal FIND_PACKAGE() -MACRO(MACRO_OPTIONAL_FIND_PACKAGE _name ) +MACRO (MACRO_OPTIONAL_FIND_PACKAGE _name ) OPTION(WITH_${_name} "Search for ${_name} package" ON) if (WITH_${_name}) FIND_PACKAGE(${_name} ${ARGN}) @@ -18,5 +18,5 @@ MACRO(MACRO_OPTIONAL_FIND_PACKAGE _name ) set(${_name}_LIBRARY) set(${_name}_LIBRARIES) endif (WITH_${_name}) -ENDMACRO(MACRO_OPTIONAL_FIND_PACKAGE) +ENDMACRO (MACRO_OPTIONAL_FIND_PACKAGE) -- 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/MacroOptionalFindPackage.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules/MacroOptionalFindPackage.cmake') diff --git a/modules/MacroOptionalFindPackage.cmake b/modules/MacroOptionalFindPackage.cmake index 70681312..816cdb7e 100644 --- a/modules/MacroOptionalFindPackage.cmake +++ b/modules/MacroOptionalFindPackage.cmake @@ -7,6 +7,12 @@ # The standard _FOUND variables can be used in the same way # as when using the normal FIND_PACKAGE() +# 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. + + MACRO (MACRO_OPTIONAL_FIND_PACKAGE _name ) OPTION(WITH_${_name} "Search for ${_name} package" ON) if (WITH_${_name}) -- cgit v1.2.1 From 39e15386ff70e6218ae149795c0cfbecf357c79f Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 22 Nov 2009 16:20:02 +0000 Subject: cosmetics: all lower-case Alex svn path=/trunk/KDE/kdelibs/; revision=1052840 --- modules/MacroOptionalFindPackage.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/MacroOptionalFindPackage.cmake') diff --git a/modules/MacroOptionalFindPackage.cmake b/modules/MacroOptionalFindPackage.cmake index 816cdb7e..f09952f3 100644 --- a/modules/MacroOptionalFindPackage.cmake +++ b/modules/MacroOptionalFindPackage.cmake @@ -13,10 +13,10 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -MACRO (MACRO_OPTIONAL_FIND_PACKAGE _name ) - OPTION(WITH_${_name} "Search for ${_name} package" ON) +macro (MACRO_OPTIONAL_FIND_PACKAGE _name ) + option(WITH_${_name} "Search for ${_name} package" ON) if (WITH_${_name}) - FIND_PACKAGE(${_name} ${ARGN}) + find_package(${_name} ${ARGN}) else (WITH_${_name}) set(${_name}_FOUND) set(${_name}_INCLUDE_DIR) @@ -24,5 +24,5 @@ MACRO (MACRO_OPTIONAL_FIND_PACKAGE _name ) set(${_name}_LIBRARY) set(${_name}_LIBRARIES) endif (WITH_${_name}) -ENDMACRO (MACRO_OPTIONAL_FIND_PACKAGE) +endmacro (MACRO_OPTIONAL_FIND_PACKAGE) -- cgit v1.2.1 From 139e74d81f6e0f7a50ba114328d97726b43d3497 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Wed, 6 Jan 2010 22:09:54 +0000 Subject: bugfix: this macro did actually in most cases not work as it should, since most find-modules set UPPERCASE_FOUND, while this set only CamelCase_FOUND. Now it sets both. Alex CCMAIL: vkrause@kde.org svn path=/trunk/KDE/kdelibs/; revision=1070843 --- modules/MacroOptionalFindPackage.cmake | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) (limited to 'modules/MacroOptionalFindPackage.cmake') diff --git a/modules/MacroOptionalFindPackage.cmake b/modules/MacroOptionalFindPackage.cmake index f09952f3..d4ed48e3 100644 --- a/modules/MacroOptionalFindPackage.cmake +++ b/modules/MacroOptionalFindPackage.cmake @@ -7,22 +7,42 @@ # The standard _FOUND variables can be used in the same way # as when using the normal FIND_PACKAGE() -# Copyright (c) 2006, Alexander Neundorf, +# Copyright (c) 2006-2010 Alexander Neundorf, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# This is just a helper macro to set a bunch of variables empty. +# We don't know whether the package uses UPPERCASENAME or CamelCaseName, so we try both: +macro(_MOFP_SET_EMPTY_IF_DEFINED _name _var) + if(DEFINED ${_name}_${_var}) + set(${_name}_${_var} "") + endif(DEFINED ${_name}_${_var}) + + string(TOUPPER ${_name} _nameUpper) + if(DEFINED ${_nameUpper}_${_var}) + set(${_nameUpper}_${_var} "") + endif(DEFINED ${_nameUpper}_${_var}) +endmacro(_MOFP_SET_EMPTY_IF_DEFINED _package _var) + macro (MACRO_OPTIONAL_FIND_PACKAGE _name ) option(WITH_${_name} "Search for ${_name} package" ON) if (WITH_${_name}) find_package(${_name} ${ARGN}) else (WITH_${_name}) - set(${_name}_FOUND) - set(${_name}_INCLUDE_DIR) - set(${_name}_INCLUDES) - set(${_name}_LIBRARY) - set(${_name}_LIBRARIES) + string(TOUPPER ${_name} _nameUpper) + set(${_name}_FOUND FALSE) + set(${_nameUpper}_FOUND FALSE) + + _mofp_set_empty_if_defined(${_name} INCLUDE_DIRS) + _mofp_set_empty_if_defined(${_name} INCLUDE_DIR) + _mofp_set_empty_if_defined(${_name} INCLUDES) + _mofp_set_empty_if_defined(${_name} LIBRARY) + _mofp_set_empty_if_defined(${_name} LIBRARIES) + _mofp_set_empty_if_defined(${_name} LIBS) + _mofp_set_empty_if_defined(${_name} FLAGS) + _mofp_set_empty_if_defined(${_name} DEFINITIONS) endif (WITH_${_name}) endmacro (MACRO_OPTIONAL_FIND_PACKAGE) -- cgit v1.2.1