ENH: Simplify decision to use system libraries
Previously we disallowed use of system libraries if FindXMLRPC.cmake was not available. Now that CMake 2.4 is required to build, the module is always available. This change simplifies the logic accordingly.
This commit is contained in:
parent
f0ab852000
commit
f68c6af51e
|
@ -13,14 +13,6 @@ MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY)
|
|||
# simply to improve readability of the main script
|
||||
#-----------------------------------------------------------------------
|
||||
MACRO(CMAKE_HANDLE_SYSTEM_LIBRARIES)
|
||||
# Third party libraries must be something that can be found.
|
||||
IF(EXISTS ${CMAKE_ROOT}/Modules/FindXMLRPC.cmake)
|
||||
SET(CMAKE_ALLOW_SYSTEM_LIBRARIES 1)
|
||||
ELSE(EXISTS ${CMAKE_ROOT}/Modules/FindXMLRPC.cmake)
|
||||
SET(CMAKE_ALLOW_SYSTEM_LIBRARIES 0)
|
||||
ENDIF(EXISTS ${CMAKE_ROOT}/Modules/FindXMLRPC.cmake)
|
||||
|
||||
IF(CMAKE_ALLOW_SYSTEM_LIBRARIES)
|
||||
# Options have dependencies.
|
||||
INCLUDE(CMakeDependentOption)
|
||||
|
||||
|
@ -59,13 +51,6 @@ MACRO(CMAKE_HANDLE_SYSTEM_LIBRARIES)
|
|||
# libtar does not have our modifications to allow reentrant
|
||||
# object-oriented use of the library.
|
||||
# OPTION(CMAKE_USE_SYSTEM_TAR "Use system-installed tar" OFF)
|
||||
ELSE(CMAKE_ALLOW_SYSTEM_LIBRARIES)
|
||||
SET(CMAKE_USE_SYSTEM_CURL 0)
|
||||
SET(CMAKE_USE_SYSTEM_EXPAT 0)
|
||||
SET(CMAKE_USE_SYSTEM_XMLRPC 0)
|
||||
SET(CMAKE_USE_SYSTEM_ZLIB 0)
|
||||
ENDIF(CMAKE_ALLOW_SYSTEM_LIBRARIES)
|
||||
|
||||
|
||||
# Mention to the user what system libraries are being used.
|
||||
FOREACH(util CURL EXPAT XMLRPC ZLIB)
|
||||
|
|
Loading…
Reference in New Issue