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
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
#
|
#
|
||||||
# *********************************************************************** #
|
# *********************************************************************** #
|
||||||
project('libconfig', 'cpp', version: 'v1.0.3', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0')
|
project('libconfig', 'cpp', version: 'v1.0.6', 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')
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
#include "yaml-cpp/yaml.h"
|
#include "yaml-cpp/yaml.h"
|
||||||
|
|
||||||
#include "config.h"
|
#include "fourdst/config/config.h"
|
||||||
|
|
||||||
namespace fourdst::config {
|
namespace fourdst::config {
|
||||||
|
|
||||||
@@ -1,26 +1,26 @@
|
|||||||
# Define the library
|
# Define the library
|
||||||
config_sources = files(
|
config_sources = files(
|
||||||
'private/config.cpp',
|
'lib/config.cpp',
|
||||||
)
|
)
|
||||||
|
|
||||||
config_headers = files(
|
|
||||||
'public/config.h'
|
|
||||||
)
|
|
||||||
|
|
||||||
# Define the libconfig library so it can be linked against by other parts of the build system
|
# Define the libconfig library so it can be linked against by other parts of the build system
|
||||||
libconfig = library('config',
|
libconfig = library('config',
|
||||||
config_sources,
|
config_sources,
|
||||||
include_directories: include_directories('public'),
|
include_directories: include_directories('include'),
|
||||||
cpp_args: ['-fvisibility=default'],
|
cpp_args: ['-fvisibility=default'],
|
||||||
dependencies: [yaml_cpp_dep],
|
dependencies: [yaml_cpp_dep],
|
||||||
install : true)
|
install : true)
|
||||||
|
|
||||||
config_dep = declare_dependency(
|
config_dep = declare_dependency(
|
||||||
include_directories: include_directories('public'),
|
include_directories: include_directories('include'),
|
||||||
link_with: libconfig,
|
link_with: libconfig,
|
||||||
sources: config_sources,
|
sources: config_sources,
|
||||||
dependencies: [yaml_cpp_dep],
|
dependencies: [yaml_cpp_dep],
|
||||||
)
|
)
|
||||||
|
|
||||||
# Make headers accessible
|
# Make headers accessible
|
||||||
|
config_headers = files(
|
||||||
|
'include/fourdst/config/config.h'
|
||||||
|
)
|
||||||
install_headers(config_headers, subdir : 'fourdst/fourdst/config')
|
install_headers(config_headers, subdir : 'fourdst/fourdst/config')
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
#include "config.h"
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
@@ -7,6 +6,8 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
|
#include "fourdst/config/config.h"
|
||||||
|
|
||||||
std::string EXAMPLE_FILENAME = std::string(getenv("MESON_SOURCE_ROOT")) + "/tests/config/example.yaml";
|
std::string EXAMPLE_FILENAME = std::string(getenv("MESON_SOURCE_ROOT")) + "/tests/config/example.yaml";
|
||||||
/**
|
/**
|
||||||
* @file configTest.cpp
|
* @file configTest.cpp
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ foreach test_file : test_sources
|
|||||||
exe_name,
|
exe_name,
|
||||||
test_file,
|
test_file,
|
||||||
dependencies: [gtest_dep, config_dep, gtest_main],
|
dependencies: [gtest_dep, config_dep, gtest_main],
|
||||||
include_directories: include_directories('../../src/config/public'),
|
|
||||||
install_rpath: '@loader_path/../../src' # Ensure runtime library path resolves correctly
|
install_rpath: '@loader_path/../../src' # Ensure runtime library path resolves correctly
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user