diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-03-07 11:10:12 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-03-07 11:10:12 -0800 |
| commit | 7221344fd89a46b2bb4eb300f0633c76823bee55 (patch) | |
| tree | 988073e93c5b86331ec31a4a933a1388bc934686 | |
| parent | a03df3f43308901f742d2afd47e3a0a1abfc3a8b (diff) | |
| download | vcpkg-7221344fd89a46b2bb4eb300f0633c76823bee55.tar.gz vcpkg-7221344fd89a46b2bb4eb300f0633c76823bee55.zip | |
[libmysql][chakracore] Add fast fail for uwp
| -rw-r--r-- | ports/chakracore/portfile.cmake | 9 | ||||
| -rw-r--r-- | ports/libmysql/portfile.cmake | 11 |
2 files changed, 18 insertions, 2 deletions
diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index ce5934eb1..7e8d8ec6e 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -1,10 +1,15 @@ -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) message(STATUS "Warning: Static building not supported yet. Building dynamic.") set(VCPKG_LIBRARY_LINKAGE dynamic) endif() -if (VCPKG_CRT_LINKAGE STREQUAL static) +if(VCPKG_CRT_LINKAGE STREQUAL static) message(FATAL_ERROR "Static linking of the CRT is not yet supported.") endif() + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "UWP is not currently supported.") +endif() + include(vcpkg_common_functions) vcpkg_from_github( diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index 741e67308..dee383a81 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -2,6 +2,10 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/include/mysql/mysql.h") message(FATAL_ERROR "FATAL ERROR: libmysql and libmariadb are incompatible.") endif() +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "libmysql cannot currently be cross-compiled for UWP") +endif() + include(vcpkg_common_functions) vcpkg_from_github( @@ -18,6 +22,11 @@ vcpkg_apply_patches( ${CMAKE_CURRENT_LIST_DIR}/boost_and_build.patch ) +set(STACK_DIRECTION) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(STACK_DIRECTION -DSTACK_DIRECTION=-1) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS @@ -25,6 +34,8 @@ vcpkg_configure_cmake( -DWITH_UNIT_TESTS=OFF -DENABLED_PROFILING=OFF -DWIX_DIR=OFF + -DHAVE_LLVM_LIBCPP_EXITCODE=1 + ${STACK_DIRECTION} -DWINDOWS_RUNTIME_MD=ON # Note: this disables _replacement_ of /MD with /MT. If /MT is specified, it will be preserved. ) |