From c9f2886b3db9783eaa455c21288eabdc7e6366a1 Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Thu, 16 Feb 2012 10:31:32 +0100 Subject: -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 --- Utilities/cmcurl/CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 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 -- cgit v0.12