Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ src/test.sp*
src/*.log
src/*.trs


build/
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq libsnappy-dev

script: autoreconf --install && ./configure && make && make check
script:
- mkdir build && cd build && cmake .. && make
12 changes: 12 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
project (sparkey)
cmake_minimum_required (VERSION 2.7)

add_subdirectory (src)

find_package (Doxygen)
if (DOXYGEN_FOUND)
add_custom_target (doc
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Running Doxygen" VERBATIM)
endif ()
15 changes: 0 additions & 15 deletions Makefile.am

This file was deleted.

32 changes: 0 additions & 32 deletions configure.ac

This file was deleted.

15 changes: 15 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
set (SRC
buf.c hashalgorithms.c hashiter.c hashwriter.c
logreader.c returncodes.c util.c endiantools.c
hashheader.c hashreader.c logheader.c logwriter.c MurmurHash3.c)

set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -Wall -Wextra -Wfloat-equal -Wshadow -Wpointer-arith -Werror -pedantic -std=c99")

add_library (sparkey ${SRC})
add_executable (sparkey-cli ${SRC} main.c)
add_executable (sparkey-bench ${SRC} bench.c)

set_target_properties (sparkey-cli PROPERTIES OUTPUT_NAME sparkey)

target_link_libraries (sparkey-cli snappy)
target_link_libraries (sparkey-bench snappy)