cmake: remove scream-make (all-caps functions)

This commit is contained in:
Ben Boeckel 2014-10-22 15:17:32 -04:00
parent abbd5c0bdb
commit 031e3da724
1 changed files with 15 additions and 15 deletions

View File

@ -38,14 +38,14 @@
find_package(MiniUpnpc QUIET) find_package(MiniUpnpc QUIET)
# FreeBSD doesn't play well with the local copy, so default to using shared # FreeBSD doesn't play well with the local copy, so default to using shared
SET(USE_SHARED_MINIUPNPC false) set(USE_SHARED_MINIUPNPC false)
# If we have the correct shared version and we're not building static, use it # If we have the correct shared version and we're not building static, use it
IF(STATIC) if(STATIC)
SET(USE_SHARED_MINIUPNPC false) set(USE_SHARED_MINIUPNPC false)
ELSEIF(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER) elseif(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER)
SET(USE_SHARED_MINIUPNPC true) set(USE_SHARED_MINIUPNPC true)
ENDIF() endif()
if(USE_SHARED_MINIUPNPC) if(USE_SHARED_MINIUPNPC)
message(STATUS "Using shared miniupnpc found at ${MINIUPNP_INCLUDE_DIR}") message(STATUS "Using shared miniupnpc found at ${MINIUPNP_INCLUDE_DIR}")
@ -59,7 +59,7 @@ else()
else() else()
message(STATUS "Using miniupnpc from local source tree (/external/miniupnpc)") message(STATUS "Using miniupnpc from local source tree (/external/miniupnpc)")
endif() endif()
set(UPNPC_BUILD_STATIC ON CACHE BOOL "Build static library") set(UPNPC_BUILD_STATIC ON CACHE BOOL "Build static library")
set(UPNPC_BUILD_SHARED OFF CACHE BOOL "Build shared library") set(UPNPC_BUILD_SHARED OFF CACHE BOOL "Build shared library")
set(UPNPC_BUILD_TESTS OFF CACHE BOOL "Build test executables") set(UPNPC_BUILD_TESTS OFF CACHE BOOL "Build test executables")
@ -78,22 +78,22 @@ endif()
find_package(Unbound) find_package(Unbound)
IF(NOT UNBOUND_INCLUDE_DIR OR STATIC) if(NOT UNBOUND_INCLUDE_DIR OR STATIC)
add_subdirectory(unbound) add_subdirectory(unbound)
set(UNBOUND_STATIC true PARENT_SCOPE) set(UNBOUND_STATIC true PARENT_SCOPE)
set(UNBOUND_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/unbound/libunbound" PARENT_SCOPE) set(UNBOUND_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/unbound/libunbound" PARENT_SCOPE)
set(UNBOUND_LIBRARY "unbound" PARENT_SCOPE) set(UNBOUND_LIBRARY "unbound" PARENT_SCOPE)
set(UNBOUND_LIBRARY_DIRS "${LIBEVENT2_LIBRARY_DIRS}" PARENT_SCOPE) set(UNBOUND_LIBRARY_DIRS "${LIBEVENT2_LIBRARY_DIRS}" PARENT_SCOPE)
ELSE() else()
MESSAGE(STATUS "Found libunbound include (unbound.h) in ${UNBOUND_INCLUDE_DIR}") message(STATUS "Found libunbound include (unbound.h) in ${UNBOUND_INCLUDE_DIR}")
IF(UNBOUND_LIBRARIES) if(UNBOUND_LIBRARIES)
MESSAGE(STATUS "Found libunbound shared library") message(STATUS "Found libunbound shared library")
set(UNBOUND_STATIC false PARENT_SCOPE) set(UNBOUND_STATIC false PARENT_SCOPE)
set(UNBOUND_INCLUDE ${UNBOUND_INCLUDE_DIR} PARENT_SCOPE) set(UNBOUND_INCLUDE ${UNBOUND_INCLUDE_DIR} PARENT_SCOPE)
set(UNBOUND_LIBRARY ${UNBOUND_LIBRARIES} PARENT_SCOPE) set(UNBOUND_LIBRARY ${UNBOUND_LIBRARIES} PARENT_SCOPE)
set(UNBOUND_LIBRARY_DIRS "" PARENT_SCOPE) set(UNBOUND_LIBRARY_DIRS "" PARENT_SCOPE)
ELSE() else()
die("Found libunbound includes, but could not find libunbound library. Please make sure you have installed libunbound or libunbound-dev or the equivalent") die("Found libunbound includes, but could not find libunbound library. Please make sure you have installed libunbound or libunbound-dev or the equivalent")
ENDIF() endif()
ENDIF() endif()