diff options
| author | Thomas Fussell <thomas.fussell@gmail.com> | 2017-03-17 00:33:06 -0400 |
|---|---|---|
| committer | Thomas Fussell <thomas.fussell@gmail.com> | 2017-03-17 00:33:06 -0400 |
| commit | d821b0a28a7223d0b49745c53a3ff032fcb001c8 (patch) | |
| tree | 12e13d5ff298a4e4b4f946ceb90b49cbfbe2d2c9 /ports/cpprestsdk | |
| parent | 4921636f6bc92e041a410870ce564615c85a6cfb (diff) | |
| parent | 01b1e39c6a006adba7b9cf2af758be679d0b7eb9 (diff) | |
| download | vcpkg-d821b0a28a7223d0b49745c53a3ff032fcb001c8.tar.gz vcpkg-d821b0a28a7223d0b49745c53a3ff032fcb001c8.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg
Diffstat (limited to 'ports/cpprestsdk')
| -rw-r--r-- | ports/cpprestsdk/0002_no_websocketpp_in_uwp.patch | 13 | ||||
| -rw-r--r-- | ports/cpprestsdk/portfile.cmake | 12 |
2 files changed, 22 insertions, 3 deletions
diff --git a/ports/cpprestsdk/0002_no_websocketpp_in_uwp.patch b/ports/cpprestsdk/0002_no_websocketpp_in_uwp.patch new file mode 100644 index 000000000..ab54baf01 --- /dev/null +++ b/ports/cpprestsdk/0002_no_websocketpp_in_uwp.patch @@ -0,0 +1,13 @@ +diff --git a/release/CMakeLists.txt b/release/CMakeLists.txt +index fe245e6..94a5c57 100644 +--- a/release/CMakeLists.txt ++++ b/release/CMakeLists.txt +@@ -177,7 +177,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries) + + # These settings can be used by the test targets + set(Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include) +-if (NOT CPPREST_EXCLUDE_WEBSOCKETS) ++if (NOT CPPREST_EXCLUDE_WEBSOCKETS AND NOT WINDOWS_STORE AND NOT WINDOWS_PHONE) + find_path(WEBSOCKETPP_CONFIG websocketpp-config.cmake + HINTS /usr/lib/cmake/websocketpp) + find_path(WEBSOCKETPP_CONFIG_VERSION websocketpp-configVersion.cmake diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake index f92c5147a..2d23bf632 100644 --- a/ports/cpprestsdk/portfile.cmake +++ b/ports/cpprestsdk/portfile.cmake @@ -13,15 +13,21 @@ vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch + ${CMAKE_CURRENT_LIST_DIR}/0002_no_websocketpp_in_uwp.patch ) -SET(WEBSOCKETPP_PATH "${CURRENT_INSTALLED_DIR}/share/websocketpp") +set(OPTIONS) +if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + SET(WEBSOCKETPP_PATH "${CURRENT_INSTALLED_DIR}/share/websocketpp") + list(APPEND OPTIONS + -DWEBSOCKETPP_CONFIG=${WEBSOCKETPP_PATH} + -DWEBSOCKETPP_CONFIG_VERSION=${WEBSOCKETPP_PATH}) +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/Release OPTIONS - -DWEBSOCKETPP_CONFIG=${WEBSOCKETPP_PATH} - -DWEBSOCKETPP_CONFIG_VERSION=${WEBSOCKETPP_PATH} + ${OPTIONS} -DBUILD_TESTS=OFF -DBUILD_SAMPLES=OFF -DCPPREST_EXCLUDE_WEBSOCKETS=OFF |