diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2010-11-07 18:06:10 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2010-11-07 18:06:10 +0000 |
| commit | 95ffc4dde3715e66195bce7ec25c08a6b5e8cc73 (patch) | |
| tree | 9f50f9a67dc6a0ebd4588f82070c263c4fef6a80 /modules | |
| parent | e7cdf5b80ffee65d4bd0412b6c829edb8e165ecb (diff) | |
| download | extra-cmake-modules-95ffc4dde3715e66195bce7ec25c08a6b5e8cc73.tar.gz extra-cmake-modules-95ffc4dde3715e66195bce7ec25c08a6b5e8cc73.tar.bz2 | |
-remove the include guards again, they might keep us from including our own version, if first our version has been loaded (mark as loaded), then the one from cmake (with potentially different behaviour), and then again our version (not loaded because the first one has already marked the file as included)
Alex
svn path=/trunk/KDE/kdelibs/; revision=1193960
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/CMakeParseArguments.cmake | 6 | ||||
| -rw-r--r-- | modules/FindPackageHandleStandardArgs.cmake | 6 | ||||
| -rw-r--r-- | modules/FindPkgConfig.cmake | 6 |
3 files changed, 0 insertions, 18 deletions
diff --git a/modules/CMakeParseArguments.cmake b/modules/CMakeParseArguments.cmake index 7ce4c49a..6c8ca46d 100644 --- a/modules/CMakeParseArguments.cmake +++ b/modules/CMakeParseArguments.cmake @@ -74,12 +74,6 @@ # License text for the above reference.) -if(__CMAKE_PARSE_ARGUMENTS_INCLUDED) - return() -endif() -set(__CMAKE_PARSE_ARGUMENTS_INCLUDED TRUE) - - function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgNames) # first set all result variables to empty/FALSE foreach(arg_name ${_singleArgNames} ${_multiArgNames}) diff --git a/modules/FindPackageHandleStandardArgs.cmake b/modules/FindPackageHandleStandardArgs.cmake index 2a20493f..1152ce6a 100644 --- a/modules/FindPackageHandleStandardArgs.cmake +++ b/modules/FindPackageHandleStandardArgs.cmake @@ -67,12 +67,6 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -# Include guard, it's not necessary to parse this fail again and again: -IF(_FPHSA_ALREADY_INCLUDED) - RETURN() -ENDIF(_FPHSA_ALREADY_INCLUDED) -SET(_FPHSA_ALREADY_INCLUDED TRUE) - INCLUDE(FindPackageMessage) INCLUDE(CMakeParseArguments) diff --git a/modules/FindPkgConfig.cmake b/modules/FindPkgConfig.cmake index 6f2435ca..78c4a13f 100644 --- a/modules/FindPkgConfig.cmake +++ b/modules/FindPkgConfig.cmake @@ -100,12 +100,6 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -# Include guard, it's not necessary to parse this fail again and again: -IF(_FINDPKGCONFIG_ALREADY_INCLUDED AND PKG_CONFIG_EXECUTABLE) - RETURN() -ENDIF(_FINDPKGCONFIG_ALREADY_INCLUDED AND PKG_CONFIG_EXECUTABLE) -SET(_FINDPKGCONFIG_ALREADY_INCLUDED TRUE) - ### Common stuff #### set(PKG_CONFIG_VERSION 1) set(PKG_CONFIG_FOUND 0) |