aboutsummaryrefslogtreecommitdiff
path: root/ports/proj4/fix-sqlite-dependency-export.patch
diff options
context:
space:
mode:
authorJackBoosY <yuzaiyang@beyondsoft.com>2020-01-13 23:55:59 -0800
committerJackBoosY <yuzaiyang@beyondsoft.com>2020-01-13 23:55:59 -0800
commit2514481b42ebdeec28649582fc666955cf206c84 (patch)
tree60c9809a5c3c8adbad240a40b1088a6f8e42c019 /ports/proj4/fix-sqlite-dependency-export.patch
parentb751326c91c9a307aaf5e340b61ab9f2d1ad45a4 (diff)
parent28eee51adb36f2165be846e77ef7b3ee5b3f8789 (diff)
downloadvcpkg-2514481b42ebdeec28649582fc666955cf206c84.tar.gz
vcpkg-2514481b42ebdeec28649582fc666955cf206c84.zip
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/jack/upgrade_libi
Diffstat (limited to 'ports/proj4/fix-sqlite-dependency-export.patch')
-rw-r--r--ports/proj4/fix-sqlite-dependency-export.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/ports/proj4/fix-sqlite-dependency-export.patch b/ports/proj4/fix-sqlite-dependency-export.patch
index a7f051699..774d1acfd 100644
--- a/ports/proj4/fix-sqlite-dependency-export.patch
+++ b/ports/proj4/fix-sqlite-dependency-export.patch
@@ -1,13 +1,13 @@
diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake
-index 5a0a807..f7bfffd 100644
+index 2e90f98f..dc171e91 100644
--- a/src/lib_proj.cmake
+++ b/src/lib_proj.cmake
-@@ -439,7 +439,7 @@ if(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT)
+@@ -441,7 +441,7 @@ if(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT)
endif()
include_directories(${SQLITE3_INCLUDE_DIR})
-target_link_libraries(${PROJ_CORE_TARGET} ${SQLITE3_LIBRARY})
+target_link_libraries(${PROJ_CORE_TARGET} PUBLIC ${SQLITE3_LIBRARY})
- if(MSVC)
+ if(MSVC AND BUILD_LIBPROJ_SHARED)
target_compile_definitions(${PROJ_CORE_TARGET}