File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -66,11 +66,22 @@ file(
6666 "${PROJECT_SOURCE_DIR } /../thirdparty/nlohmann_json_schema_validator/*.cpp"
6767)
6868
69+ file (
70+ GLOB_RECURSE INCLUDE_FILES
71+ "${PROJECT_SOURCE_DIR } /include/*.hpp"
72+ "${PROJECT_SOURCE_DIR } /include/testing/*.hpp"
73+ "${PROJECT_SOURCE_DIR } /include/impl/*.ipp"
74+ "${PROJECT_SOURCE_DIR } /../thirdparty/nlohmann_json/nlohmann/*.hpp"
75+ "${PROJECT_SOURCE_DIR } /../thirdparty/nlohmann_json_schema_validator/*.hpp"
76+ "${PROJECT_SOURCE_DIR } /../thirdparty/nlohmann_json_schema_validator/nlohmann/*.hpp"
77+ )
78+
6979# Compile C++ library
7080compile_library (
7181 "${PROJECT_SOURCE_DIR } /src/cpp" # Source directory (not used because the list in ${SOURCE_FILES} is used instead)
72- "${PROJECT_SOURCE_DIR } /include" # Include directory
82+ "${PROJECT_SOURCE_DIR } /include" # Include directory (not used because the list in ${INCLUDE_FILES} is used instead)
7383 "${SOURCE_FILES} " # List of source files to compile
84+ "${INCLUDE_FILES} " # List of include files
7485)
7586
7687###############################################################################
Original file line number Diff line number Diff line change @@ -140,7 +140,7 @@ YamlValidator::YamlValidator(
140140 catch (const std::exception& e)
141141 {
142142 throw eprosima::utils::ConfigurationException (
143- utils::Formatter () << " Error occured while setting the JSON schema in the YamlValidator: "
143+ utils::Formatter () << " Error occured while setting the JSON schema in the YamlValidator:\n "
144144 << e.what ());
145145 }
146146}
@@ -160,7 +160,7 @@ nlohmann::json YamlValidator::from_file(
160160 {
161161 throw eprosima::utils::ConfigurationException (
162162 utils::Formatter () << " Error occured while loading JSON schema from file: "
163- << schema_path << " : " << e.what ());
163+ << schema_path << " :\n " << e.what ());
164164 }
165165}
166166
@@ -175,7 +175,7 @@ nlohmann::json YamlValidator::from_string(
175175 catch (const std::exception& e)
176176 {
177177 throw eprosima::utils::ConfigurationException (
178- utils::Formatter () << " Error occured while loading JSON schema from input string: "
178+ utils::Formatter () << " Error occured while loading JSON schema from input string:\n "
179179 << e.what ());
180180 }
181181}
@@ -190,7 +190,7 @@ void YamlValidator::set_schema(
190190 catch (const std::exception& e)
191191 {
192192 throw eprosima::utils::ConfigurationException (
193- utils::Formatter () << " Error occured while setting the JSON schema in the YamlValidator: "
193+ utils::Formatter () << " Error occured while setting the JSON schema in the YamlValidator:\n "
194194 << e.what ());
195195 }
196196}
You can’t perform that action at this time.
0 commit comments