mirror of https://gitee.com/bigwinds/arangodb
Silence cpack rpm build.
This commit is contained in:
parent
549e7b46d7
commit
9730f4cbfd
|
@ -55,8 +55,10 @@
|
|||
# License text for the above reference.)
|
||||
|
||||
if (UNIX)
|
||||
find_package(PkgConfig QUIET)
|
||||
pkg_check_modules(_OPENSSL QUIET openssl)
|
||||
find_package(PkgConfig)# QUIET)
|
||||
pkg_check_modules(_OPENSSL openssl)
|
||||
message("unixxxx _OPENSSL_ROOT_HINTS_AND_PATHS ${_OPENSSL_ROOT_HINTS_AND_PATHS}")
|
||||
message("_OPENSSL_LIBDIR ${_OPENSSL_LIBDIR}")
|
||||
endif ()
|
||||
|
||||
# Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
|
||||
|
@ -355,8 +357,11 @@ if(WIN32 AND NOT CYGWIN)
|
|||
set(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
|
||||
endif()
|
||||
else()
|
||||
message("inelse ----------")
|
||||
message("_OPENSSL_ROOT_HINTS_AND_PATHS ${_OPENSSL_ROOT_HINTS_AND_PATHS}")
|
||||
message("_OPENSSL_LIBDIR ${_OPENSSL_LIBDIR}")
|
||||
|
||||
find_library(OPENSSL_SSL_LIBRARY
|
||||
find_library(OPENSSL_SSL_LIBRARY
|
||||
NAMES
|
||||
ssl
|
||||
ssleay32
|
||||
|
@ -473,6 +478,10 @@ else ()
|
|||
OPENSSL_INCLUDE_DIR
|
||||
)
|
||||
endif ()
|
||||
get_cmake_property(_variableNames VARIABLES)
|
||||
foreach (_variableName ${_variableNames})
|
||||
message(STATUS "${_variableName}=${${_variableName}}")
|
||||
endforeach()
|
||||
|
||||
mark_as_advanced(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)
|
||||
if(OPENSSL_FOUND)
|
||||
|
|
|
@ -39,7 +39,7 @@ endforeach()
|
|||
|
||||
add_custom_target(package-arongodb-server
|
||||
COMMAND ${CMAKE_COMMAND} .
|
||||
COMMAND ${CMAKE_CPACK_COMMAND} -V -G RPM
|
||||
COMMAND ${CMAKE_CPACK_COMMAND} -G RPM
|
||||
COMMAND cp "${CPACK_TEMPORARY_DIRECTORY}/${CPACK_CLIENT_PACKAGE_FILE_NAME}.rpm" "${PROJECT_BINARY_DIR}"
|
||||
WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
|
||||
list(APPEND PACKAGES_LIST package-arongodb-server)
|
||||
|
|
Loading…
Reference in New Issue