tboudreaux/libcomposition
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(atomic): fixed atomic header install location

Browse Source
This commit is contained in:
Emily Boudreaux
2026-06-12 10:37:01 -04:00
parent 0431e0c7de
commit 997c845b3d
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Doxyfile
View File

@@ -48,7 +48,7 @@ PROJECT_NAME = fourdst::libcomposition
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # 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 # 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 # for a project that appears at the top of each page and should give viewers a

4
meson.build
View File

@@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 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 default visibility for all C++ targets
add_project_arguments('-fvisibility=default', language: 'cpp') add_project_arguments('-fvisibility=default', language: 'cpp')
@@ -31,6 +31,7 @@ if get_option('build_python')
composition_libdir = fourdst_pkg / 'lib' composition_libdir = fourdst_pkg / 'lib'
composition_header_install_dir = fourdst_pkg / 'include' / 'fourdst' / 'composition' 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_lib_dir = fourdst_pkg / 'lib' / 'vendor'
vendor_header_dir = fourdst_pkg / 'include' / 'fourdst' / 'vendor' vendor_header_dir = fourdst_pkg / 'include' / 'fourdst' / 'vendor'
@@ -38,6 +39,7 @@ if get_option('build_python')
else else
composition_libdir = get_option('libdir') composition_libdir = get_option('libdir')
composition_header_install_dir = get_option('includedir') / 'fourdst' / 'composition' 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...') message('Installing libcomposition in non python (normal) mode. Install locations are...')
endif endif
message(' Libraries: ' + composition_libdir) message(' Libraries: ' + composition_libdir)

4
src/composition/meson.build
View File

@@ -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_utils, install_dir: composition_header_install_dir / 'utils')
install_data(composition_headers_io, install_dir: composition_header_install_dir / 'io') 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_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_exception_headers, install_dir: composition_header_install_dir / 'exceptions')
install_data(composition_iterator_headers, install_dir: composition_header_install_dir / 'iterators') install_data(composition_iterator_headers, install_dir: composition_header_install_dir / 'iterators')
else else
@@ -106,7 +106,7 @@ else
install_headers(composition_headers_utils, install_dir: composition_header_install_dir / 'utils') 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_io, install_dir: composition_header_install_dir / 'io')
install_headers(composition_headers_decorators, install_dir: composition_header_install_dir / 'decorators') 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_exception_headers, install_dir: composition_header_install_dir / 'exceptions')
install_headers(composition_iterator_headers, install_dir: composition_header_install_dir / 'iterators') install_headers(composition_iterator_headers, install_dir: composition_header_install_dir / 'iterators')
endif endif