From ce403305e170800a94c0f193ac3b463da5b21a9d Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Tue, 1 Mar 2005 14:21:45 -0500 Subject: [PATCH] COMP: CMake should be build static. Also propagate build_shared_libs to curl --- CMakeLists.txt | 2 ++ Source/CTest/Curl/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c75cc6a1b..cc6e7eb40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,8 @@ SET(CMake_VERSION_PATCH 0) SET(CMake_VERSION "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}") SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}") +SET(BUILD_SHARED_LIBS OFF) + SET(CMAKE_DATA_DIR "/share/CMake" CACHE STRING "Install location for data (relative to prefix).") SET(CMAKE_DOC_DIR "/doc/CMake" CACHE STRING diff --git a/Source/CTest/Curl/CMakeLists.txt b/Source/CTest/Curl/CMakeLists.txt index f23be4bb2..1188f757a 100644 --- a/Source/CTest/Curl/CMakeLists.txt +++ b/Source/CTest/Curl/CMakeLists.txt @@ -559,7 +559,7 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H) CONFIGURE_FILE(${LIBCURL_SOURCE_DIR}/config.h.in ${LIBCURL_BINARY_DIR}/config.h) -ADD_LIBRARY(Curl STATIC ${libCurl_SRCS}) +ADD_LIBRARY(Curl ${libCurl_SRCS}) TARGET_LINK_LIBRARIES(Curl ${CURL_LIBS})