diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-02-24 02:32:50 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-02-24 02:32:50 -0800 |
| commit | d90b38c12293861b430d1dde88e0d01df74085d7 (patch) | |
| tree | 05df72066b15e794f1167a407f91a3a6da7ecb87 | |
| parent | 9bf1809e28b92a7f54e152c7bb1ff4f488084285 (diff) | |
| download | vcpkg-d90b38c12293861b430d1dde88e0d01df74085d7.tar.gz vcpkg-d90b38c12293861b430d1dde88e0d01df74085d7.zip | |
[scintilla] Use out of source builds. Detect static builds for fast fail.
| -rw-r--r-- | ports/scintilla/CONTROL | 2 | ||||
| -rw-r--r-- | ports/scintilla/portfile.cmake | 32 |
2 files changed, 15 insertions, 19 deletions
diff --git a/ports/scintilla/CONTROL b/ports/scintilla/CONTROL index f382cb552..e833bcb41 100644 --- a/ports/scintilla/CONTROL +++ b/ports/scintilla/CONTROL @@ -1,3 +1,3 @@ Source: scintilla -Version: 3.7.6 +Version: 3.7.6-1 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 4bdfc8ec8..af0fcf41d 100644 --- a/ports/scintilla/portfile.cmake +++ b/ports/scintilla/portfile.cmake @@ -1,23 +1,19 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg> -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + message(FATAL_ERROR "scintilla only supports dynamic linkage") +endif() +if(VCPKG_CRT_LINKAGE STREQUAL "static") + message(FATAL_ERROR "scintilla only supports dynamic crt") +endif() include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/scintilla) +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/scintilla376.zip" + FILENAME "scintilla376.zip" + SHA512 618a50405eede3277d7696ac58122aeeb490d10ae392c60c7f78baaa96c965a8e1a599948e0ebd61bed7f75894b01bdf4574a0e5d0e20996bfdfb2e1bdb33203 ) -vcpkg_extract_source_archive(${ARCHIVE}) +file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) +vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) if(TRIPLET_SYSTEM_ARCH MATCHES "x86") set(BUILD_ARCH "Win32") @@ -26,8 +22,8 @@ else() endif() vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/Win32/SciLexer.vcxproj - PLATFORM ${MSBUILD_PLATFORM} + PROJECT_PATH ${SOURCE_PATH}/Win32/SciLexer.vcxproj + PLATFORM ${MSBUILD_PLATFORM} ) # Handle headers |