aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-02-24 02:45:13 -0800
committerRobert Schumacher <roschuma@microsoft.com>2018-02-24 02:45:13 -0800
commite38bdde03db90e4138e36a9b6aede050c89c86d3 (patch)
treebf9051ca17985e48480d81dbf586502c46ae5a2b
parent3638b0d4bf631a079e49769f262f783ab9b3d828 (diff)
downloadvcpkg-e38bdde03db90e4138e36a9b6aede050c89c86d3.tar.gz
vcpkg-e38bdde03db90e4138e36a9b6aede050c89c86d3.zip
[torch-th] Early detection to fail fast
-rw-r--r--ports/torch-th/CONTROL2
-rw-r--r--ports/torch-th/portfile.cmake9
2 files changed, 9 insertions, 2 deletions
diff --git a/ports/torch-th/CONTROL b/ports/torch-th/CONTROL
index 1ff2e2ff4..7c8f79883 100644
--- a/ports/torch-th/CONTROL
+++ b/ports/torch-th/CONTROL
@@ -1,3 +1,3 @@
Source: torch-th
-Version: 20180131-89ede3ba90c906a8ec6b9a0f4bef188ba5bb2fd8-1
+Version: 20180131-89ede3ba90c906a8ec6b9a0f4bef188ba5bb2fd8-2
Description: Torch's TH library
diff --git a/ports/torch-th/portfile.cmake b/ports/torch-th/portfile.cmake
index 7dca19ca6..7d31fccc4 100644
--- a/ports/torch-th/portfile.cmake
+++ b/ports/torch-th/portfile.cmake
@@ -1,3 +1,10 @@
+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)
vcpkg_from_github(
@@ -15,7 +22,7 @@ vcpkg_apply_patches(
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/lib/TH
- PREFER_NINJA # Disable this option if project cannot be built with Ninja
+ PREFER_NINJA
OPTIONS
-DWITH_OPENMP=OFF
)