fix(headers): moved all headers to fourdst/
This commit is contained in:
@@ -18,7 +18,7 @@
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
# *********************************************************************** #
|
||||
project('libconstants', 'cpp', version: 'v1.0.5', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0')
|
||||
project('libconstants', 'cpp', version: 'v1.0.6', 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')
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <set>
|
||||
|
||||
|
||||
#include "const.h"
|
||||
#include "fourdst/constants/const.h"
|
||||
#include "embedded_constants.h" // Generated at build time by meson
|
||||
|
||||
namespace fourdst::constant {
|
||||
@@ -1,24 +1,24 @@
|
||||
# Define the library
|
||||
const_sources = files(
|
||||
'private/const.cpp',
|
||||
'lib/const.cpp',
|
||||
)
|
||||
|
||||
const_headers = files(
|
||||
'public/const.h'
|
||||
)
|
||||
|
||||
# Define the libconst library so it can be linked against by other parts of the build system
|
||||
libconst = library('const',
|
||||
const_sources,
|
||||
include_directories: include_directories('public'),
|
||||
include_directories: include_directories('include'),
|
||||
cpp_args: ['-fvisibility=default'],
|
||||
dependencies: [const_data_dep],
|
||||
install : true)
|
||||
|
||||
const_dep = declare_dependency(
|
||||
include_directories: include_directories('public'),
|
||||
include_directories: include_directories('include'),
|
||||
link_with: libconst,
|
||||
)
|
||||
|
||||
# Make headers accessible
|
||||
const_headers = files(
|
||||
'include/fourdst/constants/const.h'
|
||||
)
|
||||
install_headers(const_headers, subdir : 'fourdst/fourdst/constants')
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
#include <gtest/gtest.h>
|
||||
#include "const.h"
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <set>
|
||||
#include <sstream>
|
||||
|
||||
#include "fourdst/constants/const.h"
|
||||
|
||||
/**
|
||||
* @file constTest.cpp
|
||||
* @brief Unit tests for the const class.
|
||||
|
||||
@@ -12,8 +12,6 @@ foreach test_file : test_sources
|
||||
exe_name,
|
||||
test_file,
|
||||
dependencies: [gtest_dep, const_dep, gtest_main],
|
||||
include_directories: include_directories('../../src/constants/public'),
|
||||
link_with: libconst, # Link the dobj library
|
||||
install_rpath: '@loader_path/../../src' # Ensure runtime library path resolves correctly
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user