diff options
| author | Mateusz Loskot <mateusz@loskot.net> | 2018-06-07 23:44:00 +0200 |
|---|---|---|
| committer | Mateusz Loskot <mateusz@loskot.net> | 2018-06-08 00:04:45 +0200 |
| commit | b745ee0a10681d05f61a686e4d61c687ba9b8c48 (patch) | |
| tree | 61ddffc9b0b21dbcc0235de30b113f63f6b80c46 | |
| parent | ffd4674e4c15ee9bfb9c2298ad565e810b1e9110 (diff) | |
| download | PROJ-b745ee0a10681d05f61a686e4d61c687ba9b8c48.tar.gz PROJ-b745ee0a10681d05f61a686e4d61c687ba9b8c48.zip | |
Export proj target to scope visible for test/unit target
Refines #1034
| -rw-r--r-- | src/lib_proj.cmake | 3 | ||||
| -rw-r--r-- | test/unit/basic_test.cpp | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index 0a05b18d..249e8173 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -315,7 +315,8 @@ set_target_properties(${PROJ_CORE_TARGET} ############################################## # Link properties ############################################## -set(PROJ_LIBRARIES ${PROJ_CORE_TARGET} ) +set(PROJ_LIBRARIES ${PROJ_CORE_TARGET}) +set(PROJ_LIBRARIES ${PROJ_LIBRARIES} PARENT_SCOPE) # hack, required for test/unit if(UNIX) find_library(M_LIB m) if(M_LIB) diff --git a/test/unit/basic_test.cpp b/test/unit/basic_test.cpp index 8ee82bf4..d565f839 100644 --- a/test/unit/basic_test.cpp +++ b/test/unit/basic_test.cpp @@ -27,13 +27,18 @@ ****************************************************************************/ #include "gtest_include.h" +#include <proj.h> +#include <memory> namespace { // --------------------------------------------------------------------------- TEST( dumy, dummy ) { - ASSERT_EQ( 1 , 1 ); + std::unique_ptr<PJ, decltype(&::proj_destroy)> pj( + ::proj_create(PJ_DEFAULT_CTX, "+proj=merc +ellps=clrk66 +lat_ts=33"), + &::proj_destroy); + ASSERT_NE(pj, nullptr); } } // namespace |
