summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2005-03-16 18:26:36 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2005-03-16 18:26:36 (GMT)
commit3768961a667634c6f5d5dec22157241bb317f760 (patch)
tree728d3ea09cf9b6b6c876e86a84a4a1ac8c999ef7 /CMakeLists.txt
parentd224858e1f19ccd1c5d250aee0e8c7e7ec2ece47 (diff)
downloadCMake-3768961a667634c6f5d5dec22157241bb317f760.zip
CMake-3768961a667634c6f5d5dec22157241bb317f760.tar.gz
CMake-3768961a667634c6f5d5dec22157241bb317f760.tar.bz2
COMP: More cleanups
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt19
1 files changed, 16 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08c1b0d..b06b2b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,6 +62,17 @@ SET(KWSYS_HEADER_ROOT ${CMake_BINARY_DIR}/Source)
SUBDIRS(Source/kwsys)
#-----------------------------------------------------------------------------
+# Build zlib library for Curl, CMake, and CTest.
+SUBDIRS(Utilities/cmzlib)
+SET(CMAKE_ZLIB_INCLUDES
+ "${CMAKE_CURRENT_BINARY_DIR}/Utilities"
+ )
+SET(CMAKE_ZLIB_LIBRARIES "cmzlib")
+SET(CURL_SPECIAL_LIBZ ${CMAKE_ZLIB_LIBRARIES})
+SET(CURL_SPECIAL_LIBZ_INCLUDES ${CMAKE_ZLIB_INCLUDES})
+SET(CURL_SPECIAL_ZLIB_H "cmzlib/zlib.h")
+
+#-----------------------------------------------------------------------------
# Build Curl library for CTest.
SUBDIRS(Source/CTest/Curl)
SET(CMAKE_CURL_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/Source/CTest/Curl")
@@ -69,9 +80,11 @@ SET(CMAKE_CURL_LIBRARIES "Curl")
#-----------------------------------------------------------------------------
# Build expat library for CMake and CTest.
-INCLUDE_DIRECTORIES(${CMake_BINARY_DIR}/Utilities)
-SUBDIRS(Utilities/cmexpat Utilities/cmzlib)
-SET(CMAKE_EXPAT_INCLUDES "${CMAKE_CURRENT_BINARY_DIR}/Utilities/cmexpat")
+SUBDIRS(Utilities/cmexpat)
+SET(CMAKE_EXPAT_INCLUDES
+ "${CMAKE_CURRENT_BINARY_DIR}/Utilities"
+ "${CMAKE_CURRENT_BINARY_DIR}/Utilities/cmexpat"
+ )
SET(CMAKE_EXPAT_LIBRARIES "cmexpat")
SUBDIRS(Utilities/cmxmlrpc)