Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of github.com:arangodb/arangodb into devel

This commit is contained in:
Michael Hackstein 2017-04-24 18:31:25 +02:00
parent bce4b9ef5d 34f04a56e2
commit dd90398dfe
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/InstallMacros.cmake
View File

@ -74,9 +74,9 @@ macro (install_readme input output)
if (MSVC) if (MSVC)
set(CRLFSTYLE "CRLF") set(CRLFSTYLE "CRLF")
endif () endif ()
configure_file(${PROJECT_SOURCE_DIR}/${input} "${PROJECT_BINARY_DIR}/${input}" NEWLINE_STYLE ${CRLFSTYLE}) configure_file(${PROJECT_SOURCE_DIR}/${input} "${PROJECT_BINARY_DIR}/${output}" NEWLINE_STYLE ${CRLFSTYLE})
install( install(
FILES "${PROJECT_BINARY_DIR}/${input}" FILES "${PROJECT_BINARY_DIR}/${output}"
DESTINATION "${where}" DESTINATION "${where}"
) )
endmacro () endmacro ()

6
cmake/packages/snap.cmake
View File

@ -7,7 +7,6 @@ endif()
if(SNAPCRAFT_FOUND) if(SNAPCRAFT_FOUND)
set(SNAPCRAFT_TEMPLATE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Installation/Ubuntu") set(SNAPCRAFT_TEMPLATE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Installation/Ubuntu")
set(SNAPCRAFT_SOURCE_DIR "${CMAKE_BINARY_DIR}/_CPack_Packages/SNAP") set(SNAPCRAFT_SOURCE_DIR "${CMAKE_BINARY_DIR}/_CPack_Packages/SNAP")
set(CPACK_SNAP_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_*${ARANGODB_PACKAGE_ARCHITECTURE}.snap")
message(STATUS "Creating snap package") message(STATUS "Creating snap package")
@ -32,6 +31,11 @@ if(SNAPCRAFT_FOUND)
COPY "${SNAPCRAFT_TEMPLATE_DIR}/arangodb.png" COPY "${SNAPCRAFT_TEMPLATE_DIR}/arangodb.png"
DESTINATION "${SNAPCRAFT_SOURCE_DIR}/" DESTINATION "${SNAPCRAFT_SOURCE_DIR}/"
) )
set(CPACK_SNAP_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${ARANGODB_PACKAGE_ARCHITECTURE}.snap")
if(NOT EXISTS ${CPACK_SNAP_PACKAGE_FILE_NAME})
set(CPACK_SNAP_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-${ARANGODB_PACKAGE_REVISION}_${ARANGODB_PACKAGE_ARCHITECTURE}.snap")
endif()
add_custom_target(snap add_custom_target(snap
COMMENT "create snap-package" COMMENT "create snap-package"
COMMAND ${SNAP_EXE} snap COMMAND ${SNAP_EXE} snap