aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-02-24 02:36:58 -0800
committerRobert Schumacher <roschuma@microsoft.com>2018-02-24 02:36:58 -0800
commit3638b0d4bf631a079e49769f262f783ab9b3d828 (patch)
tree93c40355ce4c69d2a7441f0d7584ad4316f2c036
parentd90b38c12293861b430d1dde88e0d01df74085d7 (diff)
downloadvcpkg-3638b0d4bf631a079e49769f262f783ab9b3d828.tar.gz
vcpkg-3638b0d4bf631a079e49769f262f783ab9b3d828.zip
[scintilla] Upgrade to 4.0.3
-rw-r--r--ports/scintilla/CONTROL2
-rw-r--r--ports/scintilla/portfile.cmake16
2 files changed, 8 insertions, 10 deletions
diff --git a/ports/scintilla/CONTROL b/ports/scintilla/CONTROL
index e833bcb41..7cf89dfd2 100644
--- a/ports/scintilla/CONTROL
+++ b/ports/scintilla/CONTROL
@@ -1,3 +1,3 @@
Source: scintilla
-Version: 3.7.6-1
+Version: 4.0.3
Description: A free source code editing component for Win32, GTK+, and OS X
diff --git a/ports/scintilla/portfile.cmake b/ports/scintilla/portfile.cmake
index af0fcf41d..ecf554abd 100644
--- a/ports/scintilla/portfile.cmake
+++ b/ports/scintilla/portfile.cmake
@@ -8,9 +8,9 @@ endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/scintilla)
vcpkg_download_distfile(ARCHIVE
- URLS "http://www.scintilla.org/scintilla376.zip"
- FILENAME "scintilla376.zip"
- SHA512 618a50405eede3277d7696ac58122aeeb490d10ae392c60c7f78baaa96c965a8e1a599948e0ebd61bed7f75894b01bdf4574a0e5d0e20996bfdfb2e1bdb33203
+ URLS "http://www.scintilla.org/scintilla403.zip"
+ FILENAME "scintilla403.zip"
+ SHA512 51704651e99a6b51afff9957676afcf71fa1cc289c1713402c6e50c44a12ec956d5216751ebbbe6f251a23fa8c974510e7c9f37cb66f25f69c30e500e426baad
)
file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
@@ -41,12 +41,10 @@ else()
set(BUILD_DIR_RELEASE "${BUILD_ARCH}/Release")
endif()
-if(VCPKG_LIBRARY_LINKAGE MATCHES "dynamic")
- file(INSTALL ${SOURCE_PATH}/win32/${BUILD_DIR_RELEASE}/SciLexer.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
- file(INSTALL ${SOURCE_PATH}/win32/${BUILD_DIR_DEBUG}/SciLexer.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
-file(INSTALL ${SOURCE_PATH}/win32/${BUILD_DIR_RELEASE}/SciLexer.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-file(INSTALL ${SOURCE_PATH}/win32/${BUILD_DIR_DEBUG}/SciLexer.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+file(INSTALL ${SOURCE_PATH}/win32/${BUILD_DIR_RELEASE}/SciLexer.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+file(INSTALL ${SOURCE_PATH}/win32/${BUILD_DIR_DEBUG}/SciLexer.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+file(INSTALL ${SOURCE_PATH}/win32/${BUILD_DIR_RELEASE}/SciLexer.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+file(INSTALL ${SOURCE_PATH}/win32/${BUILD_DIR_DEBUG}/SciLexer.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
# Handle PDBs