Skip to content

Commit

Permalink
Merge pull request #457 from Ghabry/release/0.8
Browse files Browse the repository at this point in the history
Release 0.8
  • Loading branch information
fdelapena committed Apr 29, 2023
2 parents 2637def + 0ee6ed1 commit 9c09529
Show file tree
Hide file tree
Showing 274 changed files with 490 additions and 322 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Expand Up @@ -4,7 +4,7 @@ if(${CMAKE_VERSION} VERSION_LESS 3.12)
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
endif()

project(liblcf VERSION 0.7.0 LANGUAGES CXX)
project(liblcf VERSION 0.8 LANGUAGES CXX)

# Compilation options
option(BUILD_SHARED_LIBS "Build shared library, disable for building the static library (default: ON)" ON)
Expand Down
172 changes: 156 additions & 16 deletions CMakePresets.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion COPYING
@@ -1,4 +1,4 @@
Copyright (c) 2014-2021 liblcf authors
Copyright (c) 2014-2023 liblcf authors

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
17 changes: 14 additions & 3 deletions Makefile.am
@@ -1,7 +1,9 @@
ACLOCAL_AMFLAGS = --install -I builds/autoconf/m4

EXTRA_DIST = AUTHORS.md README.md generator \
CMakeLists.txt builds/cmake mime builds/Doxyfile
CMakeLists.txt CMakePresets.json builds/cmake \
mime builds/Doxyfile builds/release-helper.sh \
builds/sources2buildsystem.pl

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = builds/liblcf.pc
Expand Down Expand Up @@ -320,12 +322,21 @@ lcfthirdpartyinclude_HEADERS = \

nodist_lcfinclude_HEADERS = src/lcf/config.h

# These are used by CMake
EXTRA_DIST += \
bench/readldb.cpp

check_PROGRAMS = test_runner
test_runner_SOURCES = \
tests/dbarray.cpp \
tests/dbbitarray.cpp \
tests/dbstring.cpp \
tests/doctest.h \
tests/time_stamp.cpp \
tests/flag_set.cpp \
tests/test_main.cpp
tests/test_main.cpp \
tests/time_stamp.cpp \
tests/span.cpp \
tests/string_view.cpp
test_runner_CPPFLAGS = \
-I$(srcdir)/src \
-I$(srcdir)/src/generated
Expand Down
8 changes: 4 additions & 4 deletions README.md
Expand Up @@ -41,8 +41,8 @@ Building requirements:

Step-by-step instructions:

tar xf liblcf-0.7.0.tar.xz # unpack the tarball
cd liblcf-0.7.0 # enter in the package directory
tar xf liblcf-0.8.tar.xz # unpack the tarball
cd liblcf-0.8 # enter in the package directory
./configure --prefix /usr # find libraries, set options
make # compile the library
sudo make install # install system-wide
Expand Down Expand Up @@ -71,8 +71,8 @@ Building requirements:

Step-by-step instructions:

tar xf liblcf-0.7.0.tar.xz # unpack the tarball
cd liblcf-0.7.0 # enter in the package directory
tar xf liblcf-0.8.tar.xz # unpack the tarball
cd liblcf-0.8 # enter in the package directory
cmake . -DCMAKE_BUILD_TYPE=Release # configure project
cmake --build . # compile the library
sudo cmake --build . --target install # install system-wide
Expand Down
4 changes: 0 additions & 4 deletions builds/cmake/CMakePresets.json.template
Expand Up @@ -24,7 +24,6 @@
{
"name": "windows-x86",
"displayName": "Windows (x86)",
"hidden": true,
"cacheVariables": {
"VCPKG_TARGET_TRIPLET": "x86-windows-static"
},
Expand All @@ -33,7 +32,6 @@
{
"name": "windows-x86-vs2022",
"displayName": "Windows (x86) using Visual Studio 2022",
"hidden": true,
"generator": "Visual Studio 17 2022",
"architecture": "Win32",
"cacheVariables": {
Expand All @@ -44,7 +42,6 @@
{
"name": "windows-x64",
"displayName": "Windows (x64)",
"hidden": true,
"architecture": "x64",
"cacheVariables": {
"VCPKG_TARGET_TRIPLET": "x64-windows-static"
Expand All @@ -54,7 +51,6 @@
{
"name": "windows-x64-vs2022",
"displayName": "Windows (x64) using Visual Studio 2022",
"hidden": true,
"generator": "Visual Studio 17 2022",
"architecture": "x64",
"cacheVariables": {
Expand Down
1 change: 1 addition & 0 deletions builds/cmake/CMakePresetsBase.json
Expand Up @@ -5,6 +5,7 @@
"name": "base",
"displayName": "base preset",
"hidden": true,
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/${presetName}",
"cacheVariables": {
"BUILD_SHARED_LIBS": "OFF",
Expand Down

0 comments on commit 9c09529

Please sign in to comment.