diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-02-04 12:15:29 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-02-04 12:15:29 +0000 |
| commit | fb0d05a8363b1f37c24f995b9565cb90c8625256 (patch) | |
| tree | f1cadba99909fb7577f86cc0e860a378b4a6a17d /modules/MacroOptionalFindPackage.cmake | |
| parent | 817117aaa55be6d5c8ef3867630c9a9545da5520 (diff) | |
| download | extra-cmake-modules-fb0d05a8363b1f37c24f995b9565cb90c8625256.tar.gz extra-cmake-modules-fb0d05a8363b1f37c24f995b9565cb90c8625256.tar.bz2 | |
-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
Diffstat (limited to 'modules/MacroOptionalFindPackage.cmake')
| -rw-r--r-- | modules/MacroOptionalFindPackage.cmake | 16 |
1 files changed, 16 insertions, 0 deletions
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( <name> [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_<name>, which can be disabled via the cmake GUI. +# or via -DWITH_<name>=OFF +# The standard <name>_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) + |