diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-03-27 07:33:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-27 07:33:17 +0100 |
| commit | c5772cf1b7cb0f467d12f7f8b99516cc8b3a98c5 (patch) | |
| tree | ba47d9f87372202518584f7816e86cac6e4da53e | |
| parent | 05e2e52c1338fd42e7443e5998ad43a7fb9982b1 (diff) | |
| parent | 9be0245b0133d9ea8a23b87230d00b75c31b288e (diff) | |
| download | PROJ-c5772cf1b7cb0f467d12f7f8b99516cc8b3a98c5.tar.gz PROJ-c5772cf1b7cb0f467d12f7f8b99516cc8b3a98c5.zip | |
Merge pull request #1375 from OSGeo/backport-1356-on-6.0
Backport #1356 on 6.0: pj_strerrno: enable system error messages
| -rw-r--r-- | src/strerrno.cpp | 1 | ||||
| -rw-r--r-- | test/unit/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/unit/proj_errno_string_test.cpp | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/strerrno.cpp b/src/strerrno.cpp index 20255747..af130fc4 100644 --- a/src/strerrno.cpp +++ b/src/strerrno.cpp @@ -5,6 +5,7 @@ #include <string.h> #include "proj.h" +#include "proj_config.h" #include "proj_internal.h" static const char * const diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index 58638fa4..fb6ff8d7 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -68,6 +68,8 @@ endif() include_directories(${CMAKE_SOURCE_DIR}/include) include_directories(${SQLITE3_INCLUDE_DIR}) +# Add the directory containing proj_config.h +include_directories(${CMAKE_BINARY_DIR}/src) add_executable(proj_pj_transform_test main.cpp diff --git a/test/unit/proj_errno_string_test.cpp b/test/unit/proj_errno_string_test.cpp index dcdff5c4..a592b31f 100644 --- a/test/unit/proj_errno_string_test.cpp +++ b/test/unit/proj_errno_string_test.cpp @@ -29,6 +29,7 @@ #include <cstring> #include "proj.h" +#include "proj_config.h" #include "gtest_include.h" |