diff options
| author | Adam Szmigin <smidge@xsco.net> | 2020-07-11 18:22:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-11 18:22:01 +0100 |
| commit | b0db43da2e3b40c54cd0823fa17305c68389bdb7 (patch) | |
| tree | 4677e3cc01e7396b5c2295f929360c30b3fd7d12 | |
| parent | 04157223fd67cd6b52b0c954d297d694194fd273 (diff) | |
| parent | 6b73cd37bf63f0a1fdbba1652cf8b696f4e38572 (diff) | |
Merge pull request #13 from xsco/enh/cmake_build_update
Remove Boost from CMake build
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index be7b1d0..060a8f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,15 +6,12 @@ # The meson/ninja build should be preferred in all other cases. # cmake_minimum_required(VERSION 3.10) -project(libdjinterop VERSION 0.9.0) +project(libdjinterop VERSION 0.11.0) # Require C++17 set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED True) -# Require Boost >= 1.65 (headers only) -find_package(Boost 1.65 REQUIRED) - # Require sqlite3 >= 3.11.0 find_package(SQLite3 3.11.0 REQUIRED) @@ -46,11 +43,10 @@ add_library( target_compile_definitions( djinterop PUBLIC - _MODERN_SQLITE_BOOST_OPTIONAL_SUPPORT) + DJINTEROP_SOURCE) target_include_directories( djinterop PUBLIC - ${Boost_INCLUDE_DIRS} ${SQLite3_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} include src) @@ -63,6 +59,7 @@ target_link_libraries( install(TARGETS djinterop DESTINATION lib) install(FILES include/djinterop/album_art.hpp + include/djinterop/config.hpp include/djinterop/crate.hpp include/djinterop/database.hpp include/djinterop/djinterop.hpp diff --git a/meson.build b/meson.build index 3d26931..065833f 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'djinterop', 'cpp', 'c', - version: '0.10.0', + version: '0.11.0', license: 'LGPL-3.0', default_options: ['cpp_std=c++17', 'default_library=both']) |