From 0dfcddcd1790be399cf20db4f2d355c2005d125e Mon Sep 17 00:00:00 2001 From: George Fotopoulos Date: Mon, 25 Feb 2019 21:33:01 +0200 Subject: [PATCH] Update CMakeLists.txt, .travis.yml and .drone.yml (#67) * Update CMakeLists.txt Adds support for CPack so that you can make .deb and .rpm packages. * Update CMakeLists.txt * Update .travis.yml * Update .travis.yml Speedup compiling * Update .travis.yml * Update .drone.yml Speedup compiling * Update .travis.yml Remove `-j2` flag because we probably run out of memory when running 2 jobs in parallel and that's why the compilation fails. --- .drone.yml | 4 ++-- .travis.yml | 5 ++--- CMakeLists.txt | 17 ++++++++++++++++- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index c22021c9f..60b45643d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,5 +5,5 @@ steps: - name: test image: gcc:8 commands: - - make - - make quiettest + - make -j2 + - make quiettest -j2 diff --git a/.travis.yml b/.travis.yml index d616c919e..8476ea2ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -language: c++ +language: cpp sudo: false addons: apt: @@ -15,6 +15,5 @@ branches: script: - export CXX=g++-7 - export CC=gcc-7 - - make + - make - make test - diff --git a/CMakeLists.txt b/CMakeLists.txt index 28411715f..7ac7b24e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.8...3.13) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_MACOSX_RPATH OFF) @@ -34,3 +34,18 @@ add_subdirectory(src) add_subdirectory(tools) add_subdirectory(tests) add_subdirectory(benchmark) + +set(CPACK_PACKAGE_VENDOR "Daniel Lemire") +set(CPACK_PACKAGE_CONTACT "lemire@gmail.com") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Parsing gigabytes of JSON per second") +set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) +set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) +set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH}) +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") +set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md") + +set(CPACK_RPM_PACKAGE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") + +set(CPACK_SOURCE_GENERATOR "TGZ;ZIP") + +include(CPack)