diff options
| author | Florin Crișan <florin.crisan@gmail.com> | 2019-05-09 23:28:04 +0300 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-05-09 13:28:04 -0700 |
| commit | e36d550dd4c1bcc2f8a1aabbd6ce9d394bad8603 (patch) | |
| tree | eed414c0ce1a7c2148904ef4110e7c02413cf84c | |
| parent | 34cadd0b0435e9d4606f95725a4dbd3b2198ce0a (diff) | |
| download | vcpkg-e36d550dd4c1bcc2f8a1aabbd6ce9d394bad8603.tar.gz vcpkg-e36d550dd4c1bcc2f8a1aabbd6ce9d394bad8603.zip | |
[ace] Add support for features (ssl, wchar, xml) #6372 (#6376)
| -rw-r--r-- | ports/ace/CONTROL | 10 | ||||
| -rw-r--r-- | ports/ace/portfile.cmake | 24 |
2 files changed, 33 insertions, 1 deletions
diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL index 9d4d36cd5..8b76f644a 100644 --- a/ports/ace/CONTROL +++ b/ports/ace/CONTROL @@ -1,3 +1,13 @@ Source: ace Version: 6.5.5-1 Description: The ADAPTIVE Communication Environment + +Feature: wchar +Description: Enable extra wide char functions in ACE + +Feature: ssl +Description: Enable SSL/TLS features in ACE +Build-Depends: openssl + +Feature: xml +Description: Enable XML features in ACE diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index d33028c9a..264829dfb 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -2,6 +2,21 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "${PORT} does not currently support UWP") endif() +if("wchar" IN_LIST FEATURES) + list(APPEND ACE_FEATURE_LIST "uses_wchar=1") +endif() +if("zlib" IN_LIST FEATURES) + list(APPEND ACE_FEATURE_LIST "zlib=1") +else() + list(APPEND ACE_FEATURE_LIST "zlib=0") +endif() +if("ssl" IN_LIST FEATURES) + list(APPEND ACE_FEATURE_LIST "ssl=1") +else() + list(APPEND ACE_FEATURE_LIST "ssl=0") +endif() +list(JOIN ACE_FEATURE_LIST "," ACE_FEATURES) + if (VCPKG_LIBRARY_LINKAGE STREQUAL static) if(NOT VCPKG_CMAKE_SYSTEM_NAME) set(DLL_DECORATOR s) @@ -58,7 +73,7 @@ endif() # Invoke mwc.pl to generate the necessary solution and project files vcpkg_execute_required_process( - COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} ace ${MPC_STATIC_FLAG} + COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" ace ${MPC_STATIC_FLAG} WORKING_DIRECTORY ${ACE_ROOT} LOGNAME mwc-${TARGET_TRIPLET} ) @@ -67,6 +82,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME) vcpkg_build_msbuild( PROJECT_PATH ${SOURCE_PATH}/ace.sln PLATFORM ${MSBUILD_PLATFORM} + USE_VCPKG_INTEGRATION ) endif() @@ -106,6 +122,9 @@ install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/arpa") install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/net") install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/netinet") install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/sys") +if("ssl" IN_LIST FEATURES) + install_ace_headers_subdirectory(${SOURCE_PATH} "SSL") +endif() # Install the libraries function(install_ace_library SOURCE_PATH ACE_LIBRARY) @@ -143,6 +162,9 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME) install_ace_library(${ACE_ROOT} "ACE_QoS") endif() install_ace_library(${ACE_ROOT} "ACE_RLECompression") +if("ssl" IN_LIST FEATURES) + install_ace_library(${ACE_ROOT} "ACE_SSL") +endif() # Handle copyright file(COPY ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace) |