From 9e1288da106d663fc34824de36424c363df49f96 Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Tue, 5 Oct 2004 16:14:04 -0400 Subject: PERF: Several cleanups, and remove need for Curl directory to be in include path --- Source/CMakeLists.txt | 7 +++---- Source/CTest/CMakeLists.txt | 2 -- Source/CTest/cmCTestSubmit.cxx | 2 +- Source/cmCTest.cxx | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index fdfe6bf..0040cf6 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -127,16 +127,15 @@ ENDIF (UNIX) TARGET_LINK_LIBRARIES(cmake CMakeLib) TARGET_LINK_LIBRARIES(DumpDocumentation CMakeLib) +ADD_EXECUTABLE(coverage coverage.cxx) +TARGET_LINK_LIBRARIES(coverage CMakeLib) + IF(CMAKE_BUILD_WITH_CURL) # Don't even look for this as we don't use that part of curl # and linking in the the library can cause problems. - SET(HAVE_LIBCRYPTO 0) SUBDIRS(CTest) SET(CMTEST_SRCS ${CMTEST_SRCS} CTest/cmCTestSubmit.cxx) ADD_DEFINITIONS(-DHAVE_CURL) - INCLUDE_DIRECTORIES( - ${CMAKE_SOURCE_DIR}/Source/CTest/Curl - ) ENDIF(CMAKE_BUILD_WITH_CURL) ADD_EXECUTABLE(ctest ${CMTEST_SRCS}) diff --git a/Source/CTest/CMakeLists.txt b/Source/CTest/CMakeLists.txt index c248f7d..0cfef8a 100644 --- a/Source/CTest/CMakeLists.txt +++ b/Source/CTest/CMakeLists.txt @@ -8,8 +8,6 @@ IF(CMAKE_SYSTEM MATCHES "AIX.*") ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX) ENDIF(CMAKE_SYSTEM MATCHES "AIX.*") -SET(HAVE_LIBCRYPTO 0 CACHE INTERNAL "") - IF(CMAKE_BUILD_WITH_CURL) SET(CMAKE_LIBRARY CMakeLib) ELSE(CMAKE_BUILD_WITH_CURL) diff --git a/Source/CTest/cmCTestSubmit.cxx b/Source/CTest/cmCTestSubmit.cxx index fea7997..34d53c9 100644 --- a/Source/CTest/cmCTestSubmit.cxx +++ b/Source/CTest/cmCTestSubmit.cxx @@ -19,7 +19,7 @@ PURPOSE. See the above copyright notices for more information. #include "cmSystemTools.h" #include -#include "curl/curl.h" +#include "CTest/Curl/curl/curl.h" #include cmCTestSubmit::cmCTestSubmit() : m_HTTPProxy(), m_FTPProxy() diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index fdcad63..b8cf9ac 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -14,7 +14,7 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#include "curl/curl.h" +#include "CTest/Curl/curl/curl.h" #include "cmCTest.h" #include "cmake.h" -- cgit v0.12