mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 04:49:08 +08:00
75dd38cd8a
* [proj4]Upgrade version to 6.1.1 and remove useless patches. * [libgeotiff]Fix build errors using proj4 6.1.1. * [libspatialite]Fix build errors using proj4 6.1.1. * [gdal]Fix build errors using proj4 6.1.1. * [spatialite-tools]Fix build errors using proj4 6.1.1. * [spatialite-tools]Fix build errors using proj4 6.1.1. * [libgeotiff]Re-fix build errors using proj4 6.1.1. * [vtk]Fix build errors using proj4 6.1.1. * [proj4]Fix find sqlite binary failure. * [proj4]Disable build tools when building proj4 in arm/uwp. * [sqlite3/libgeotiff]Fix libdl library linkage. Re-fix use proj issue. * add back dl libs * [gdal]Fix dependent port proj library name. * [proj4]Set Windows library name to "proj" and revert fix-proj-name changes. * [liblas]Fix build errors using proj4 6.1.1. * [liblas]Fix build errors using proj4 6.1.1. * [liblas]Fix build errors using proj4 6.1.1. * [proj4]Fix feature database on triplet arm/uwp. * [gdal]Remove useless flag PROJ_STATIC. * [proj4]Fix build error on x64-windows-static. * [liblas]Use find_library to get proj4/sqlite3 libraries. * [proj4]Fix sqlite dependency. * [proj4]Fix arm/uwp dependency. * [proj4]Fix linux build: configure error. * [proj4]Disable export proj4 namespace. * [liblas]Delete proj dependency. * [libspatialite]Fix linux build. * [libspatialite]Fix linux command. * [libspatialite]Fix configure error. * [proj4]fix static cmake tools path. * [libgeotiff]Set configure options to 1/0 to avoid the "if" comparison failure in config.cmake. [proj4]Revert changes about namespace. [liblas]Remove FindPROJ4.cmake and FindGeoTIFF.cmake from the source. * [vtk]Fix using latest proj4 issue. * [proj4]Delete missing patch.
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
|
|
index 61c69f7..777b5d8 100644
|
|
--- a/cmake/CMakeLists.txt
|
|
+++ b/cmake/CMakeLists.txt
|
|
@@ -28,7 +28,3 @@ install(FILES
|
|
install(EXPORT targets
|
|
FILE ${PROJECT_NAME_LOWER}-targets.cmake
|
|
DESTINATION "${CMAKECONFIGDIR}")
|
|
-install(EXPORT targets
|
|
- NAMESPACE ${PROJECT_NAME}::
|
|
- FILE ${PROJECT_NAME_LOWER}-namespace-targets.cmake
|
|
- DESTINATION "${CMAKECONFIGDIR}")
|
|
diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in
|
|
index c62ecb4..9a52b3b 100644
|
|
--- a/cmake/project-config.cmake.in
|
|
+++ b/cmake/project-config.cmake.in
|
|
@@ -20,10 +20,9 @@ set (@PROJECT_NAME@_INCLUDE_DIRS "${_ROOT}/@INCLUDEDIR@")
|
|
set (@PROJECT_NAME@_LIBRARY_DIRS "${_ROOT}/@LIBDIR@")
|
|
set (@PROJECT_NAME@_BINARY_DIRS "${_ROOT}/@BINDIR@")
|
|
|
|
-set (@PROJECT_NAME@_LIBRARIES @PROJECT_NAME@::proj)
|
|
+set (@PROJECT_NAME@_LIBRARIES proj)
|
|
# Read in the exported definition of the library
|
|
include ("${_DIR}/@PROJECT_NAME_LOWER@-targets.cmake")
|
|
-include ("${_DIR}/@PROJECT_NAME_LOWER@-namespace-targets.cmake")
|
|
|
|
unset (_ROOT)
|
|
unset (_DIR)
|