Skip to content

Commit 0dfcddc

Browse files
George Fotopouloslemire
authored andcommitted
Update CMakeLists.txt, .travis.yml and .drone.yml (simdjson#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.
1 parent 83ab720 commit 0dfcddc

3 files changed

Lines changed: 20 additions & 6 deletions

File tree

.drone.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ steps:
55
- name: test
66
image: gcc:8
77
commands:
8-
- make
9-
- make quiettest
8+
- make -j2
9+
- make quiettest -j2

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
language: c++
1+
language: cpp
22
sudo: false
33
addons:
44
apt:
@@ -15,6 +15,5 @@ branches:
1515
script:
1616
- export CXX=g++-7
1717
- export CC=gcc-7
18-
- make
18+
- make
1919
- make test
20-

CMakeLists.txt

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.8)
1+
cmake_minimum_required(VERSION 3.8...3.13)
22
set(CMAKE_CXX_STANDARD 17)
33
set(CMAKE_CXX_STANDARD_REQUIRED ON)
44
set(CMAKE_MACOSX_RPATH OFF)
@@ -34,3 +34,18 @@ add_subdirectory(src)
3434
add_subdirectory(tools)
3535
add_subdirectory(tests)
3636
add_subdirectory(benchmark)
37+
38+
set(CPACK_PACKAGE_VENDOR "Daniel Lemire")
39+
set(CPACK_PACKAGE_CONTACT "lemire@gmail.com")
40+
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Parsing gigabytes of JSON per second")
41+
set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
42+
set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
43+
set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
44+
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
45+
set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
46+
47+
set(CPACK_RPM_PACKAGE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
48+
49+
set(CPACK_SOURCE_GENERATOR "TGZ;ZIP")
50+
51+
include(CPack)

0 commit comments

Comments
 (0)