mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-29 20:23:41 +08:00
3efae11c36
closes #36801 closes #36253 closes #36044 ~~includes #24327 to fix dlib linkage in the osx pipelines.~~ Need to look at ~~#36044~~ ~~#36345~~ merge after - [x] #37561 --------- Co-authored-by: Alexander Neumann <you@example.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
22 lines
655 B
Diff
22 lines
655 B
Diff
diff --git a/ThirdParty/libproj/CMakeLists.txt b/ThirdParty/libproj/CMakeLists.txt
|
|
index f8888876..d57c4c18 100644
|
|
--- a/ThirdParty/libproj/CMakeLists.txt
|
|
+++ b/ThirdParty/libproj/CMakeLists.txt
|
|
@@ -4,11 +4,13 @@ vtk_module_third_party(
|
|
VERSION
|
|
"8.1.0"
|
|
STANDARD_INCLUDE_DIRS
|
|
EXTERNAL
|
|
- PACKAGE LibPROJ
|
|
- TARGETS LibPROJ::LibPROJ
|
|
- USE_VARIABLES LibPROJ_MAJOR_VERSION
|
|
+ PACKAGE PROJ
|
|
+ CONFIG_MODE
|
|
+ TARGETS PROJ::proj
|
|
+ USE_VARIABLES PROJ_VERSION_MAJOR
|
|
STANDARD_INCLUDE_DIRS)
|
|
+set(LibPROJ_MAJOR_VERSION "${PROJ_VERSION_MAJOR}")
|
|
|
|
if (NOT VTK_MODULE_USE_EXTERNAL_VTK_libproj)
|
|
set(LibPROJ_MAJOR_VERSION "8")
|