diff --git a/Doxyfile b/Doxyfile index 4f3f5ea..58c606a 100644 --- a/Doxyfile +++ b/Doxyfile @@ -48,7 +48,7 @@ PROJECT_NAME = fourdst::libcomposition # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = v2.4.8 +PROJECT_NUMBER = v2.4.9 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewers a diff --git a/meson.build b/meson.build index 2190be4..a8905e7 100644 --- a/meson.build +++ b/meson.build @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # *********************************************************************** # -project('libcomposition', 'cpp', version: 'v2.4.8', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') +project('libcomposition', 'cpp', version: 'v2.4.9', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') # Add default visibility for all C++ targets add_project_arguments('-fvisibility=default', language: 'cpp') @@ -31,6 +31,7 @@ if get_option('build_python') composition_libdir = fourdst_pkg / 'lib' composition_header_install_dir = fourdst_pkg / 'include' / 'fourdst' / 'composition' + atomic_header_install_dir = fourdst_pkg / 'include' / 'fourdst' / 'atomic' vendor_lib_dir = fourdst_pkg / 'lib' / 'vendor' vendor_header_dir = fourdst_pkg / 'include' / 'fourdst' / 'vendor' @@ -38,6 +39,7 @@ if get_option('build_python') else composition_libdir = get_option('libdir') composition_header_install_dir = get_option('includedir') / 'fourdst' / 'composition' + atomic_header_install_dir = get_option('includedir') / 'fourdst' / 'atomic' message('Installing libcomposition in non python (normal) mode. Install locations are...') endif message(' Libraries: ' + composition_libdir) diff --git a/src/composition/meson.build b/src/composition/meson.build index 950beea..5265abc 100644 --- a/src/composition/meson.build +++ b/src/composition/meson.build @@ -98,7 +98,7 @@ if get_option('build_python') install_data(composition_headers_utils, install_dir: composition_header_install_dir / 'utils') install_data(composition_headers_io, install_dir: composition_header_install_dir / 'io') install_data(composition_headers_decorators, install_dir: composition_header_install_dir / 'decorators') - install_data(composition_headers_atomic, install_dir: composition_header_install_dir / 'atomic') + install_data(composition_headers_atomic, install_dir: atomic_header_install_dir) install_data(composition_exception_headers, install_dir: composition_header_install_dir / 'exceptions') install_data(composition_iterator_headers, install_dir: composition_header_install_dir / 'iterators') else @@ -106,7 +106,7 @@ else install_headers(composition_headers_utils, install_dir: composition_header_install_dir / 'utils') install_headers(composition_headers_io, install_dir: composition_header_install_dir / 'io') install_headers(composition_headers_decorators, install_dir: composition_header_install_dir / 'decorators') - install_headers(composition_headers_atomic, install_dir: composition_header_install_dir / 'atomic') + install_headers(composition_headers_atomic, install_dir: atomic_header_install_dir) install_headers(composition_exception_headers, install_dir: composition_header_install_dir / 'exceptions') install_headers(composition_iterator_headers, install_dir: composition_header_install_dir / 'iterators') endif