diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-03-16 18:26:36 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-03-16 18:26:36 (GMT) |
| commit | 3768961a667634c6f5d5dec22157241bb317f760 (patch) | |
| tree | 728d3ea09cf9b6b6c876e86a84a4a1ac8c999ef7 /Utilities | |
| parent | d224858e1f19ccd1c5d250aee0e8c7e7ec2ece47 (diff) | |
| download | CMake-3768961a667634c6f5d5dec22157241bb317f760.zip CMake-3768961a667634c6f5d5dec22157241bb317f760.tar.gz CMake-3768961a667634c6f5d5dec22157241bb317f760.tar.bz2 | |
COMP: More cleanups
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/cmexpat/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Utilities/cmxmlrpc/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | Utilities/cmzlib/CMakeLists.txt | 6 |
3 files changed, 15 insertions, 5 deletions
diff --git a/Utilities/cmexpat/CMakeLists.txt b/Utilities/cmexpat/CMakeLists.txt index e3a1581..0cff343 100644 --- a/Utilities/cmexpat/CMakeLists.txt +++ b/Utilities/cmexpat/CMakeLists.txt @@ -10,6 +10,10 @@ SET(expat_SRCS INCLUDE(${CMAKE_ROOT}/Modules/TestBigEndian.cmake) TEST_BIG_ENDIAN(CMEXPAT_BIGENDIAN) +INCLUDE_DIRECTORIES( + "${CMEXPAT_BINARY_DIR}/.." + ) + IF(WIN32) IF(NOT BUILD_SHARED_LIBS) SET (CM_EXPAT_STATIC 1) diff --git a/Utilities/cmxmlrpc/CMakeLists.txt b/Utilities/cmxmlrpc/CMakeLists.txt index fd2784a..893fff6 100644 --- a/Utilities/cmxmlrpc/CMakeLists.txt +++ b/Utilities/cmxmlrpc/CMakeLists.txt @@ -49,11 +49,13 @@ ENDIF(ATTR_UNUSED_VAR) SET(HAVE_LIBWWW_SSL) SET(DIRECTORY_SEPARATOR "/") -FIND_PACKAGE(Threads) SET(HAVE_PTHREADS) -IF(WIN32 OR CMAKE_USE_PTHREADS_INIT) - SET(HAVE_PTHREADS 1) -ENDIF(WIN32 OR CMAKE_USE_PTHREADS_INIT) +IF(CMAKE_BUILD_XMLRPC_WITH_THREADS) + FIND_PACKAGE(Threads) + IF(WIN32 OR CMAKE_USE_PTHREADS_INIT) + SET(HAVE_PTHREADS 1) + ENDIF(WIN32 OR CMAKE_USE_PTHREADS_INIT) +ENDIF(CMAKE_BUILD_XMLRPC_WITH_THREADS) INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" diff --git a/Utilities/cmzlib/CMakeLists.txt b/Utilities/cmzlib/CMakeLists.txt index a7a4b16..793e6f4 100644 --- a/Utilities/cmzlib/CMakeLists.txt +++ b/Utilities/cmzlib/CMakeLists.txt @@ -1,7 +1,11 @@ PROJECT(CMZLIB) INCLUDE_REGULAR_EXPRESSION("^(deflate|inf|trees|zconf|zlib|zutil).*$") -INCLUDE_DIRECTORIES(${CMZLIB_SOURCE_DIR}) +INCLUDE_DIRECTORIES( + "${CMZLIB_SOURCE_DIR}" + "${CMZLIB_SOURCE_DIR}/.." + "${CMZLIB_BINARY_DIR}/.." + ) # Tell the header files included from the .c files that they are being # built. Used to disable warnings since we do not want to change the |