Commit 4d4f4e8
authored
There are three changes here.
The first is the most important.
Change 1: Thank you @cary-ilm
* Rename src/core/common to src/core/openjph
OpenJPH headers are included in application code via `#include
<openjph/ojph_version.h>`. The headers are expected to be in a folder
named "openjph". The cmake configuration places them there in the
installation step.
However, if OpenJPH is incorporated into an application via cmake's
`add_subdirectory`, there is no installation step, so there is no
"openjph" folder, leading the `#include <openjph/ojph_version.h>` to
fail.
Renaming the "common" directory to "openjph" resolves the build issue,
since the headers then live inside the source tree in a directory with
same name as the installation. The use of the "common" directory name
is entirely internal to the OpenJPH build, it has no impact on the
installation. The name should be arbitrary, so there should be no
downside to renaming it this way.
Signed-off-by: Cary Phillips <cary@ilm.com>
* This fixes PR compilation
---------
Signed-off-by: Cary Phillips <cary@ilm.com>
Co-authored-by: Cary Phillips <cary@ilm.com>
Change 2:
Message type constants are not descriptive enough, and they maybe inadvertently replaced by a preprocessor macro.
They are:
```
enum OJPH_MSG_LEVEL : int
{
ALL_MSG = 0, // uninitialized or print all message
INFO = 1, // info message
WARN = 2, // warning message
ERROR = 3, // error message (the highest severity)
NO_MSG = 4, // no message (higher severity for message printing only)
};
```
They were replaced with
```
enum OJPH_MSG_LEVEL : int
{
OJPH_MSG_ALL_MSG = 0, // uninitialized or print all message
OJPH_MSG_INFO = 1, // info message
OJPH_MSG_WARN = 2, // warning message
OJPH_MSG_ERROR = 3, // error message (the highest severity)
OJPH_MSG_NO_MSG = 4, // no message (higher severity for message printing only)
};
```
which is less like to have the identified issues.
Change 3:
Addresses the problem identified in @clshortfuse in issue #235
1 parent a1d29da commit 4d4f4e8
File tree
14 files changed
+8
-8
lines changed- src
- apps/ojph_expand
- core
- openjph
- tests
14 files changed
+8
-8
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| |||
137 | 137 | | |
138 | 138 | | |
139 | 139 | | |
140 | | - | |
| 140 | + | |
141 | 141 | | |
142 | 142 | | |
143 | 143 | | |
| |||
173 | 173 | | |
174 | 174 | | |
175 | 175 | | |
176 | | - | |
| 176 | + | |
177 | 177 | | |
178 | 178 | | |
179 | 179 | | |
| |||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
0 commit comments