mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 06:29:05 +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.
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
|
|
index beb83e2..6f216bd 100644
|
|
--- a/apps/CMakeLists.txt
|
|
+++ b/apps/CMakeLists.txt
|
|
@@ -155,7 +152,7 @@ endif()
|
|
# Targets installation
|
|
|
|
install(TARGETS ${LIBLAS_UTILITIES}
|
|
- RUNTIME DESTINATION ${LIBLAS_BIN_DIR}
|
|
+ RUNTIME DESTINATION tools
|
|
LIBRARY DESTINATION ${LIBLAS_LIB_DIR}
|
|
ARCHIVE DESTINATION ${LIBLAS_LIB_DIR})
|
|
|
|
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
|
|
index c7f583d..ca9e602 100644
|
|
--- a/cmake/CMakeLists.txt
|
|
+++ b/cmake/CMakeLists.txt
|
|
@@ -5,13 +5,8 @@
|
|
# Set where cmake will install liblas-config.cmake. It's installed in
|
|
# ${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR} and ${PROJECT_ROOT_DIR}
|
|
# is the relative path to the root from there.
|
|
-if (NOT WIN32)
|
|
- set(INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}")
|
|
- set (PROJECT_ROOT_DIR "../../..")
|
|
-else ()
|
|
- set(INSTALL_CMAKE_DIR "cmake")
|
|
- set (PROJECT_ROOT_DIR "..")
|
|
-endif ()
|
|
+set(INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}")
|
|
+set (PROJECT_ROOT_DIR "../../..")
|
|
|
|
# Now create the liblas-config files using the .in templates
|
|
configure_file (liblas-config.cmake.in
|