diff options
| author | past-due <30942300+past-due@users.noreply.github.com> | 2018-08-24 17:05:07 -0400 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-08-24 14:05:07 -0700 |
| commit | 75b7dcfefa15d3c4c9d13342041525de0771cc70 (patch) | |
| tree | cb3a81539f9c1cd769d9f31c9a981424c4020367 /ports | |
| parent | 5fd80fa19486d8b74b69754ef32e3362b57953af (diff) | |
| download | vcpkg-75b7dcfefa15d3c4c9d13342041525de0771cc70.tar.gz vcpkg-75b7dcfefa15d3c4c9d13342041525de0771cc70.zip | |
[chakracore] Fix Windows port CRT linkage (#4080)
* Fix Windows ChakraCore port CRT linkage
ChakraCore now supports both static and dynamic CRT linkage on Windows.
* [chakracore] Small cleanups
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/chakracore/CONTROL | 2 | ||||
| -rw-r--r-- | ports/chakracore/portfile.cmake | 21 |
2 files changed, 13 insertions, 10 deletions
diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL index 07b9ade32..1939a4a64 100644 --- a/ports/chakracore/CONTROL +++ b/ports/chakracore/CONTROL @@ -1,3 +1,3 @@ Source: chakracore -Version: 1.10.1 +Version: 1.10.1-1 Description: Core part of the Chakra Javascript engine diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 6a40f4663..ad5431267 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -1,17 +1,11 @@ -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) - 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_check_linkage(ONLY_DYNAMIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/ChakraCore @@ -30,9 +24,17 @@ set(BUILDTREE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) file(REMOVE_RECURSE ${BUILDTREE_PATH}) file(COPY ${SOURCE_PATH}/ DESTINATION ${BUILDTREE_PATH}) +set(CHAKRA_RUNTIME_LIB "static_library") # ChakraCore default is static CRT linkage +if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(CHAKRA_RUNTIME_LIB "dynamic_library") +endif() + vcpkg_build_msbuild( PROJECT_PATH ${BUILDTREE_PATH}/Build/Chakra.Core.sln - OPTIONS "/p:DotNetSdkRoot=${NETFXSDK_PATH}/" "/p:CustomBeforeMicrosoftCommonTargets=${CMAKE_CURRENT_LIST_DIR}/no-warning-as-error.props" + OPTIONS + "/p:DotNetSdkRoot=${NETFXSDK_PATH}/" + "/p:CustomBeforeMicrosoftCommonTargets=${CMAKE_CURRENT_LIST_DIR}/no-warning-as-error.props" + "/p:RuntimeLib=${CHAKRA_RUNTIME_LIB}" ) file(INSTALL @@ -68,6 +70,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/GCStress.exe ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/rl.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/chakracore) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/chakracore) endif() vcpkg_copy_pdbs() |