diff options
| -rw-r--r-- | data/sql/commit.sql | 8 | ||||
| -rw-r--r-- | data/sql/customizations.sql | 4 | ||||
| -rw-r--r-- | data/sql/grid_transformation.sql | 2 | ||||
| -rw-r--r-- | data/sql/metadata.sql | 4 | ||||
| -rw-r--r-- | docs/source/development/cmake.rst | 4 | ||||
| -rw-r--r-- | src/bin_cct.cmake | 2 | ||||
| -rw-r--r-- | src/bin_cs2cs.cmake | 2 | ||||
| -rw-r--r-- | src/bin_geod.cmake | 2 | ||||
| -rw-r--r-- | src/bin_geodtest.cmake | 2 | ||||
| -rw-r--r-- | src/bin_gie.cmake | 2 | ||||
| -rw-r--r-- | src/bin_proj.cmake | 2 | ||||
| -rw-r--r-- | src/bin_projinfo.cmake | 2 | ||||
| -rw-r--r-- | src/bin_projsync.cmake | 2 | ||||
| -rw-r--r-- | src/ellps.cpp | 2 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 12 | ||||
| -rw-r--r-- | test/postinstall/testappprojinfo/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/unit/CMakeLists.txt | 45 |
17 files changed, 43 insertions, 56 deletions
diff --git a/data/sql/commit.sql b/data/sql/commit.sql index 48dc4150..a580f6e0 100644 --- a/data/sql/commit.sql +++ b/data/sql/commit.sql @@ -184,14 +184,6 @@ FOR EACH ROW BEGIN SELECT RAISE(ABORT, 'missing au_ga_AUSGeoid98.tif') WHERE NOT EXISTS(SELECT 1 FROM grid_alternatives WHERE proj_grid_name = 'au_ga_AUSGeoid98.tif'); - -- clause because of buggy entries in EPSG 10.014 - SELECT RAISE(ABORT, 'invalid Geog3D to Geog2D + GravityRelatedHeight (foo) entries: target CRS is not a compound CRS') - WHERE EXISTS (SELECT 1 FROM grid_transformation gt WHERE - method_auth_name = 'EPSG' AND method_code IN ('1088', '1089', '1090', '1091', '1092', '1093', '1094', '1095', '1096', '1097', '1098', '1103') AND - gt.deprecated = 0 AND - NOT EXISTS (SELECT 1 FROM compound_crs c WHERE gt.target_crs_code = c.code AND gt.target_crs_auth_name = c.auth_name) AND - NOT (gt.auth_name = 'EPSG' AND gt.code IN ('9627')) - ); END; INSERT INTO dummy DEFAULT VALUES; diff --git a/data/sql/customizations.sql b/data/sql/customizations.sql index 47991268..63780e3a 100644 --- a/data/sql/customizations.sql +++ b/data/sql/customizations.sql @@ -356,6 +356,4 @@ SELECT u.scope_code FROM grid_transformation gt JOIN usage u ON u.object_auth_name = gt.auth_name AND u.object_code = gt.code AND u.object_table_name = 'grid_transformation' -WHERE method_auth_name = 'EPSG' AND method_code IN ('1088', '1089', '1090', '1091', '1092', '1093', '1094', '1095', '1096', '1097', '1098', '1103') AND gt.deprecated = 0 - AND EXISTS (SELECT 1 FROM compound_crs c WHERE target_crs_code = c.code AND target_crs_auth_name = c.auth_name) -- clause because of buggy entries in EPSG 10.014 - ; +WHERE method_auth_name = 'EPSG' AND method_code IN ('1088', '1089', '1090', '1091', '1092', '1093', '1094', '1095', '1096', '1097', '1098', '1103') AND gt.deprecated = 0; diff --git a/data/sql/grid_transformation.sql b/data/sql/grid_transformation.sql index b15aba30..e0a8296a 100644 --- a/data/sql/grid_transformation.sql +++ b/data/sql/grid_transformation.sql @@ -984,7 +984,7 @@ INSERT INTO "grid_transformation" VALUES('EPSG','9625','NAD83(MA11) to NAD83(MA1 INSERT INTO "usage" VALUES('EPSG','14461','grid_transformation','EPSG','9625','EPSG','4171','EPSG','1270'); INSERT INTO "grid_transformation" VALUES('EPSG','9626','NAD83(PA11) to NAD83(PA11) + ASVD02 height (1)','Reversible alternative to NAD83(PA11) to ASVD02 height (1) (code 7650). Uses Geoid12B hybrid model. See information source for further information.','EPSG','1088','Geog3D to Geog2D+GravityRelatedHeight (gtx)','EPSG','6321','EPSG','9526',0.02,'EPSG','8666','Geoid (height correction) model file','g2012bs0.bin',NULL,NULL,NULL,NULL,'EPSG','6322','NGS-Asm 12B',0); INSERT INTO "usage" VALUES('EPSG','14463','grid_transformation','EPSG','9626','EPSG','2288','EPSG','1270'); -INSERT INTO "grid_transformation" VALUES('EPSG','9627','NZGD2000 to NZGD2000 + NZVD2009 height (2)','Reversible alternative to NZGD2000 to NZVD2009 height (2) (code 9325).','EPSG','1088','Geog3D to Geog2D+GravityRelatedHeight (gtx)','EPSG','4959','EPSG','4440',0.1,'EPSG','8666','Geoid (height correction) model file','nzgeoid2009.gtx',NULL,NULL,NULL,NULL,'EPSG','4167','LINZ-NZ 2009 gtx',0); +INSERT INTO "grid_transformation" VALUES('EPSG','9627','NZGD2000 to NZGD2000 + NZVD2009 height (2)','Reversible alternative to NZGD2000 to NZVD2009 height (2) (code 9325).','EPSG','1088','Geog3D to Geog2D+GravityRelatedHeight (gtx)','EPSG','4959','EPSG','9527',0.1,'EPSG','8666','Geoid (height correction) model file','nzgeoid2009.gtx',NULL,NULL,NULL,NULL,'EPSG','4167','LINZ-NZ 2009 gtx',0); INSERT INTO "usage" VALUES('EPSG','14466','grid_transformation','EPSG','9627','EPSG','1175','EPSG','1270'); INSERT INTO "grid_transformation" VALUES('EPSG','9628','NZGD2000 to NZGD2000 + NZVD2016 height (2)','Reversible alternative to NZGD2000 to NZVD2016 height (2) (code 9326).','EPSG','1088','Geog3D to Geog2D+GravityRelatedHeight (gtx)','EPSG','4959','EPSG','9528',0.1,'EPSG','8666','Geoid (height correction) model file','nzgeoid2016.gtx',NULL,NULL,NULL,NULL,'EPSG','4167','LINZ-NZ 2016 gtx',0); INSERT INTO "usage" VALUES('EPSG','14467','grid_transformation','EPSG','9628','EPSG','1175','EPSG','1270'); diff --git a/data/sql/metadata.sql b/data/sql/metadata.sql index 0d68697c..9d8f1f6a 100644 --- a/data/sql/metadata.sql +++ b/data/sql/metadata.sql @@ -9,5 +9,5 @@ INSERT INTO "metadata" VALUES('DATABASE.LAYOUT.VERSION.MAJOR', 1); INSERT INTO "metadata" VALUES('DATABASE.LAYOUT.VERSION.MINOR', 0); -INSERT INTO "metadata" VALUES('EPSG.VERSION', 'v10.014'); -INSERT INTO "metadata" VALUES('EPSG.DATE', '2021-02-10'); +INSERT INTO "metadata" VALUES('EPSG.VERSION', 'v10.015'); +INSERT INTO "metadata" VALUES('EPSG.DATE', '2021-02-11'); diff --git a/docs/source/development/cmake.rst b/docs/source/development/cmake.rst index e965f46e..477b4f3b 100644 --- a/docs/source/development/cmake.rst +++ b/docs/source/development/cmake.rst @@ -12,7 +12,7 @@ the CMake configuration which comes with the library. Typical usage is: find_package(PROJ) - target_link_libraries(MyApp ${PROJ_LIBRARIES}) + target_link_libraries(MyApp PRIVATE ${PROJ_LIBRARIES}) By adding the imported library target ``${PROJ_LIBRARIES}`` to the target link libraries, CMake will also pass the include directories to @@ -36,7 +36,7 @@ package to work with pre-7.0 versions of PROJ, you will need to use .. code:: find_package(PROJ4) - target_link_libraries(MyApp ${PROJ4_LIBRARIES}) + target_link_libraries(MyApp PRIVATE ${PROJ4_LIBRARIES}) include_directories(${PROJ4_INCLUDE_DIRS}) This will also find version 7.0. This use of the PROJ4 name will be diff --git a/src/bin_cct.cmake b/src/bin_cct.cmake index 9e9bb7ec..b36f60de 100644 --- a/src/bin_cct.cmake +++ b/src/bin_cct.cmake @@ -8,7 +8,7 @@ set(CCT_INCLUDE apps/optargpm.h) source_group("Source Files\\Bin" FILES ${CCT_SRC}) add_executable(cct ${CCT_SRC} ${CCT_INCLUDE}) -target_link_libraries(cct ${PROJ_LIBRARIES}) +target_link_libraries(cct PRIVATE ${PROJ_LIBRARIES}) target_compile_options(cct PRIVATE ${PROJ_CXX_WARN_FLAGS}) install(TARGETS cct diff --git a/src/bin_cs2cs.cmake b/src/bin_cs2cs.cmake index 48fc802b..e3d35871 100644 --- a/src/bin_cs2cs.cmake +++ b/src/bin_cs2cs.cmake @@ -7,7 +7,7 @@ set(CS2CS_SRC source_group("Source Files\\Bin" FILES ${CS2CS_SRC}) add_executable(cs2cs ${CS2CS_SRC} ${CS2CS_INCLUDE}) -target_link_libraries(cs2cs ${PROJ_LIBRARIES}) +target_link_libraries(cs2cs PRIVATE ${PROJ_LIBRARIES}) target_compile_options(cs2cs PRIVATE ${PROJ_CXX_WARN_FLAGS}) install(TARGETS cs2cs diff --git a/src/bin_geod.cmake b/src/bin_geod.cmake index c3df5e7a..98dbc4ee 100644 --- a/src/bin_geod.cmake +++ b/src/bin_geod.cmake @@ -9,7 +9,7 @@ set(GEOD_INCLUDE apps/geod_interface.h) source_group("Source Files\\Bin" FILES ${GEOD_SRC} ${GEOD_INCLUDE}) add_executable(geod ${GEOD_SRC} ${GEOD_INCLUDE}) -target_link_libraries(geod ${PROJ_LIBRARIES}) +target_link_libraries(geod PRIVATE ${PROJ_LIBRARIES}) target_compile_options(geod PRIVATE ${PROJ_CXX_WARN_FLAGS}) install(TARGETS geod diff --git a/src/bin_geodtest.cmake b/src/bin_geodtest.cmake index cc155672..ab366144 100644 --- a/src/bin_geodtest.cmake +++ b/src/bin_geodtest.cmake @@ -4,7 +4,7 @@ set(GEODTEST_INCLUDE) source_group("Source Files\\Bin" FILES ${GEODTEST_SRC} ${GEODTEST_INCLUDE}) add_executable(geodtest ${GEODTEST_SRC} ${GEODTEST_INCLUDE}) -target_link_libraries(geodtest ${PROJ_LIBRARIES}) +target_link_libraries(geodtest PRIVATE ${PROJ_LIBRARIES}) target_compile_options(geodtest PRIVATE ${PROJ_CXX_WARN_FLAGS}) # Do not install, instead run as a test diff --git a/src/bin_gie.cmake b/src/bin_gie.cmake index 94a7cea5..5cf9d86d 100644 --- a/src/bin_gie.cmake +++ b/src/bin_gie.cmake @@ -8,7 +8,7 @@ set(GIE_INCLUDE apps/optargpm.h) source_group("Source Files\\Bin" FILES ${GIE_SRC}) add_executable(gie ${GIE_SRC} ${GIE_INCLUDE}) -target_link_libraries(gie ${PROJ_LIBRARIES}) +target_link_libraries(gie PRIVATE ${PROJ_LIBRARIES}) target_compile_options(gie PRIVATE ${PROJ_CXX_WARN_FLAGS}) install(TARGETS gie diff --git a/src/bin_proj.cmake b/src/bin_proj.cmake index 89fd3ff9..d2513386 100644 --- a/src/bin_proj.cmake +++ b/src/bin_proj.cmake @@ -10,7 +10,7 @@ add_executable(binproj ${PROJ_SRC}) set_target_properties(binproj PROPERTIES RUNTIME_OUTPUT_NAME proj) -target_link_libraries(binproj ${PROJ_LIBRARIES}) +target_link_libraries(binproj PRIVATE ${PROJ_LIBRARIES}) target_compile_options(binproj PRIVATE ${PROJ_CXX_WARN_FLAGS}) install(TARGETS binproj diff --git a/src/bin_projinfo.cmake b/src/bin_projinfo.cmake index 8610a3a7..1b8ed637 100644 --- a/src/bin_projinfo.cmake +++ b/src/bin_projinfo.cmake @@ -6,7 +6,7 @@ add_executable(binprojinfo ${PROJINFO_SRC}) set_target_properties(binprojinfo PROPERTIES OUTPUT_NAME projinfo) -target_link_libraries(binprojinfo ${PROJ_LIBRARIES}) +target_link_libraries(binprojinfo PRIVATE ${PROJ_LIBRARIES}) target_compile_options(binprojinfo PRIVATE ${PROJ_CXX_WARN_FLAGS}) install(TARGETS binprojinfo diff --git a/src/bin_projsync.cmake b/src/bin_projsync.cmake index 0e71044f..e18eebd9 100644 --- a/src/bin_projsync.cmake +++ b/src/bin_projsync.cmake @@ -6,7 +6,7 @@ add_executable(bin_projsync ${PROJSYNC_SRC}) set_target_properties(bin_projsync PROPERTIES OUTPUT_NAME projsync) -target_link_libraries(bin_projsync ${PROJ_LIBRARIES}) +target_link_libraries(bin_projsync PRIVATE ${PROJ_LIBRARIES}) target_compile_options(bin_projsync PRIVATE ${PROJ_CXX_WARN_FLAGS}) install(TARGETS bin_projsync RUNTIME DESTINATION ${BINDIR}) diff --git a/src/ellps.cpp b/src/ellps.cpp index 7a42768b..876ed2b4 100644 --- a/src/ellps.cpp +++ b/src/ellps.cpp @@ -38,7 +38,7 @@ pj_ellps[] = { {"fschr68", "a=6378150.", "rf=298.3", "Fischer 1968"}, {"helmert", "a=6378200.", "rf=298.3", "Helmert 1906"}, {"hough", "a=6378270.0", "rf=297.", "Hough"}, -{"intl", "a=6378388.0", "rf=297.", "International 1909 (Hayford)"}, +{"intl", "a=6378388.0", "rf=297.", "International 1924 (Hayford 1909, 1910)"}, {"krass", "a=6378245.0", "rf=298.3", "Krassovsky, 1942"}, {"kaula", "a=6378163.", "rf=298.24", "Kaula 1961"}, {"lerch", "a=6378139.", "rf=298.257", "Lerch 1979"}, diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index 367ff976..2a248a70 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -386,30 +386,30 @@ set(PROJ_LIBRARIES ${PROJ_LIBRARIES} PARENT_SCOPE) if(UNIX) find_library(M_LIB m) if(M_LIB) - target_link_libraries(${PROJ_CORE_TARGET} -lm) + target_link_libraries(${PROJ_CORE_TARGET} PRIVATE -lm) endif() find_library(DL_LIB dl) if(M_LIB) - target_link_libraries(${PROJ_CORE_TARGET} -ldl) + target_link_libraries(${PROJ_CORE_TARGET} PRIVATE -ldl) endif() endif() if(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT) - target_link_libraries(${PROJ_CORE_TARGET} ${CMAKE_THREAD_LIBS_INIT}) + target_link_libraries(${PROJ_CORE_TARGET} PRIVATE ${CMAKE_THREAD_LIBS_INIT}) endif() target_include_directories(${PROJ_CORE_TARGET} PRIVATE ${SQLITE3_INCLUDE_DIR}) -target_link_libraries(${PROJ_CORE_TARGET} ${SQLITE3_LIBRARY}) +target_link_libraries(${PROJ_CORE_TARGET} PRIVATE ${SQLITE3_LIBRARY}) if(TIFF_ENABLED) target_compile_definitions(${PROJ_CORE_TARGET} PRIVATE -DTIFF_ENABLED) target_include_directories(${PROJ_CORE_TARGET} PRIVATE ${TIFF_INCLUDE_DIR}) - target_link_libraries(${PROJ_CORE_TARGET} ${TIFF_LIBRARY}) + target_link_libraries(${PROJ_CORE_TARGET} PRIVATE ${TIFF_LIBRARY}) endif() if(CURL_ENABLED) target_compile_definitions(${PROJ_CORE_TARGET} PRIVATE -DCURL_ENABLED) target_include_directories(${PROJ_CORE_TARGET} PRIVATE ${CURL_INCLUDE_DIR}) - target_link_libraries(${PROJ_CORE_TARGET} ${CURL_LIBRARY}) + target_link_libraries(${PROJ_CORE_TARGET} PRIVATE ${CURL_LIBRARY}) endif() if(MSVC AND BUILD_SHARED_LIBS) diff --git a/test/postinstall/testappprojinfo/CMakeLists.txt b/test/postinstall/testappprojinfo/CMakeLists.txt index 2405bc8c..beac54ff 100644 --- a/test/postinstall/testappprojinfo/CMakeLists.txt +++ b/test/postinstall/testappprojinfo/CMakeLists.txt @@ -17,7 +17,7 @@ foreach(_variableName ${_variableNames}) endforeach() add_executable(testappprojinfo testappprojinfo.c) -target_link_libraries(testappprojinfo ${${USE_PROJ_NAME}_LIBRARIES}) +target_link_libraries(testappprojinfo PRIVATE ${${USE_PROJ_NAME}_LIBRARIES}) include(CTest) diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index 7c4c124a..b9efd926 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -73,8 +73,8 @@ add_executable(proj_errno_string_test main.cpp proj_errno_string_test.cpp) target_link_libraries(proj_errno_string_test - GTest::gtest - ${PROJ_LIBRARIES}) + PRIVATE GTest::gtest + PRIVATE ${PROJ_LIBRARIES}) add_test(NAME proj_errno_string_test COMMAND proj_errno_string_test) set_property(TEST proj_errno_string_test PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT}) @@ -83,8 +83,8 @@ add_executable(proj_angular_io_test main.cpp proj_angular_io_test.cpp) target_link_libraries(proj_angular_io_test - GTest::gtest - ${PROJ_LIBRARIES}) + PRIVATE GTest::gtest + PRIVATE ${PROJ_LIBRARIES}) add_test(NAME proj_angular_io_test COMMAND proj_angular_io_test) set_property(TEST proj_angular_io_test PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT}) @@ -93,8 +93,8 @@ add_executable(proj_context_test main.cpp proj_context_test.cpp) target_link_libraries(proj_context_test - GTest::gtest - ${PROJ_LIBRARIES}) + PRIVATE GTest::gtest + PRIVATE ${PROJ_LIBRARIES}) add_test(NAME proj_context_test COMMAND proj_context_test) set_property(TEST proj_context_test PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT}) @@ -106,8 +106,8 @@ else() main.cpp pj_phi2_test.cpp) target_link_libraries(pj_phi2_test - GTest::gtest - ${PROJ_LIBRARIES}) + PRIVATE GTest::gtest + PRIVATE ${PROJ_LIBRARIES}) add_test(NAME pj_phi2_test COMMAND pj_phi2_test) set_property(TEST pj_phi2_test PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT}) @@ -127,20 +127,19 @@ add_executable(proj_test_cpp_api test_c_api.cpp test_grids.cpp) target_link_libraries(proj_test_cpp_api - GTest::gtest - ${PROJ_LIBRARIES} - ${SQLITE3_LIBRARY}) + PRIVATE GTest::gtest + PRIVATE ${PROJ_LIBRARIES} + PRIVATE ${SQLITE3_LIBRARY}) add_test(NAME proj_test_cpp_api COMMAND proj_test_cpp_api) set_property(TEST proj_test_cpp_api PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT}) - add_executable(gie_self_tests main.cpp gie_self_tests.cpp) target_link_libraries(gie_self_tests - GTest::gtest - ${PROJ_LIBRARIES}) + PRIVATE GTest::gtest + PRIVATE ${PROJ_LIBRARIES}) add_test(NAME gie_self_tests COMMAND gie_self_tests) set_property(TEST gie_self_tests PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT}) @@ -151,34 +150,32 @@ add_executable(test_network if(CURL_ENABLED) include_directories(${CURL_INCLUDE_DIR}) target_compile_definitions(test_network PRIVATE -DCURL_ENABLED) - target_link_libraries(test_network ${CURL_LIBRARY}) + target_link_libraries(test_network PRIVATE ${CURL_LIBRARY}) endif() target_link_libraries(test_network - GTest::gtest - ${PROJ_LIBRARIES} - ${SQLITE3_LIBRARY}) + PRIVATE GTest::gtest + PRIVATE ${PROJ_LIBRARIES} + PRIVATE ${SQLITE3_LIBRARY}) add_test(NAME test_network COMMAND test_network) set_property(TEST test_network PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT}) - add_executable(test_defmodel main.cpp test_defmodel.cpp) target_link_libraries(test_defmodel - GTest::gtest - ${PROJ_LIBRARIES}) + PRIVATE GTest::gtest + PRIVATE ${PROJ_LIBRARIES}) add_test(NAME test_defmodel COMMAND test_defmodel) set_property(TEST test_defmodel PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT}) - add_executable(test_tinshift main.cpp test_tinshift.cpp) target_link_libraries(test_tinshift - GTest::gtest - ${PROJ_LIBRARIES}) + PRIVATE GTest::gtest + PRIVATE ${PROJ_LIBRARIES}) add_test(NAME test_tinshift COMMAND test_tinshift) set_property(TEST test_tinshift PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT}) |