diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-03-04 13:34:17 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-04 13:34:17 -0800 |
| commit | 8d5cb4cac4be4ae69d37554d8e499d8ac15aade4 (patch) | |
| tree | 6c7407d5392c6e6d440f5aac7c4268edbed1fe2e | |
| parent | d97841242ab800afd61d277dbfa56dd982e67368 (diff) | |
| download | vcpkg-8d5cb4cac4be4ae69d37554d8e499d8ac15aade4.tar.gz vcpkg-8d5cb4cac4be4ae69d37554d8e499d8ac15aade4.zip | |
[vtk] Fix dependency proj4 library name in cmake (#9899)
| -rw-r--r-- | ports/vtk/portfile.cmake | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 4ddfb5334..4743c6520 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -1,9 +1,7 @@ -if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(NOT VCPKG_TARGET_IS_WINDOWS) message(WARNING "You will need to install Xorg dependencies to build vtk:\napt-get install libxt-dev\n") endif() -include(vcpkg_common_functions) - set(VTK_SHORT_VERSION "8.2") set(VTK_LONG_VERSION "${VTK_SHORT_VERSION}.0") # ============================================================================= @@ -83,9 +81,13 @@ if(VTK_WITH_ALL_MODULES) ) endif() -set(PROJ_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/proj.lib") -set(PROJ_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib") - +if (VCPKG_TARGET_IS_WINDOWS) + set(PROJ_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/proj.lib") + set(PROJ_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib") +else() + set(PROJ_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libproj.a") + set(PROJ_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libproj.a") +endif() # ============================================================================= # Configure & Install @@ -250,7 +252,6 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # ============================================================================= # Handle copyright -file(COPY ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/vtk/Copyright.txt ${CURRENT_PACKAGES_DIR}/share/vtk/copyright) +file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/vtk) |