diff options
| author | Alex Neundorf <neundorf@kde.org> | 2012-02-16 09:31:32 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-02-21 20:33:39 (GMT) |
| commit | c9f2886b3db9783eaa455c21288eabdc7e6366a1 (patch) | |
| tree | 616a92c000f6e49588ab688207bedf95de09a132 | |
| parent | 628f36514070037dd3dc4f09c61c4df8688e3a2b (diff) | |
| download | CMake-c9f2886b3db9783eaa455c21288eabdc7e6366a1.zip CMake-c9f2886b3db9783eaa455c21288eabdc7e6366a1.tar.gz CMake-c9f2886b3db9783eaa455c21288eabdc7e6366a1.tar.bz2 | |
-don't pull in CheckTypeSize.cmake from the cmake which is being built
We can be sure that at least cmake 2.6.3 is used when building cmcurl.
This means we always get in the first branch of the if().
I think it is not a good idea to pull a cmake module from the cmake
which is being built in, since this may use features which are not
supported in the cmake which is used to build cmake (e.g. CMAKE_CURRENT_LIST_DIR
which does not exist in cmake 2.6.3 which is the minimum for cmcurl).
A bit further below there is anyway code to handle the case that cmake is
older than 2.8.0, so it should be ok.
Alex
| -rw-r--r-- | Utilities/cmcurl/CMakeLists.txt | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index e700ed8..ef300bd 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -33,12 +33,7 @@ INCLUDE (CheckIncludeFile) INCLUDE (CheckIncludeFiles) INCLUDE (CheckLibraryExists) INCLUDE (CheckSymbolExists) -IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4 - AND CMake_SOURCE_DIR) - INCLUDE (${CMake_SOURCE_DIR}/Modules/CheckTypeSize.cmake) -ELSE() - INCLUDE (CheckTypeSize) -ENDIF() +INCLUDE (CheckTypeSize) SET(libCurl_SRCS # amigaos.c - does not build on AmigaOS |