kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PERF: Several cleanups, and remove need for Curl directory to be in include path

Browse Source
This commit is contained in:
Andy Cedilnik 2004-10-05 16:14:04 -04:00
parent 16c839206a
commit 9e1288da10
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/CMakeLists.txt
View File

@ -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})

2
Source/CTest/CMakeLists.txt
View File

@ -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)

2
Source/CTest/cmCTestSubmit.cxx
View File

@ -19,7 +19,7 @@ PURPOSE. See the above copyright notices for more information.
#include "cmSystemTools.h"
#include <cmsys/Process.h>
#include "curl/curl.h"
#include "CTest/Curl/curl/curl.h"
#include <sys/stat.h>
cmCTestSubmit::cmCTestSubmit() : m_HTTPProxy(), m_FTPProxy()

2
Source/cmCTest.cxx
View File

@ -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"