diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-11-22 10:19:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-22 10:19:55 -0800 |
| commit | 1fa80c11968870ae4a99c6df99d5953dd298bd57 (patch) | |
| tree | e074654b42528ec212bbbaf77fd73193721d7735 | |
| parent | cfcd07b5a44618a3396f51db718706c586e5f052 (diff) | |
| parent | b4ee1a289a6c184bd8ec4bbd98ff0183a44e7dfe (diff) | |
| download | vcpkg-1fa80c11968870ae4a99c6df99d5953dd298bd57.tar.gz vcpkg-1fa80c11968870ae4a99c6df99d5953dd298bd57.zip | |
Merge pull request #8953 from davidebeatrici/mdnsresponder-dynamic-crt-fix
[mdnsresponder] Fix build with dynamic CRT
| -rw-r--r-- | ports/mdnsresponder/CONTROL | 2 | ||||
| -rw-r--r-- | ports/mdnsresponder/portfile.cmake | 29 |
2 files changed, 17 insertions, 14 deletions
diff --git a/ports/mdnsresponder/CONTROL b/ports/mdnsresponder/CONTROL index a94e7866c..66c039dbc 100644 --- a/ports/mdnsresponder/CONTROL +++ b/ports/mdnsresponder/CONTROL @@ -1,4 +1,4 @@ Source: mdnsresponder -Version: 765.30.11-1 +Version: 765.30.11-2 Description: The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP networking initiative. Homepage: https://developer.apple.com/bonjour/ diff --git a/ports/mdnsresponder/portfile.cmake b/ports/mdnsresponder/portfile.cmake index 46ab04ddb..c37b07a20 100644 --- a/ports/mdnsresponder/portfile.cmake +++ b/ports/mdnsresponder/portfile.cmake @@ -21,33 +21,36 @@ ENDIF() function(FIX_VCXPROJ VCXPROJ_PATH) file(READ ${VCXPROJ_PATH} ORIG) - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - string(REPLACE - "<ConfigurationType>StaticLibrary</ConfigurationType>" - "<ConfigurationType>DynamicLibrary</ConfigurationType>" - ORIG "${ORIG}") + if(${VCPKG_CRT_LINKAGE} STREQUAL "dynamic") string(REGEX REPLACE - "<RuntimeLibrary>*</RuntimeLibrary>" + "<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>" "<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>" ORIG "${ORIG}") string(REGEX REPLACE - "<RuntimeLibrary>*</RuntimeLibrary>" + "<RuntimeLibrary>MultiThreaded</RuntimeLibrary>" "<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>" ORIG "${ORIG}") else() - string(REPLACE - "<ConfigurationType>DynamicLibrary</ConfigurationType>" - "<ConfigurationType>StaticLibrary</ConfigurationType>" - ORIG "${ORIG}") string(REGEX REPLACE - "<RuntimeLibrary>*Debug</RuntimeLibrary>" + "<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>" "<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>" ORIG "${ORIG}") string(REGEX REPLACE - "<RuntimeLibrary>*</RuntimeLibrary>" + "<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>" "<RuntimeLibrary>MultiThreaded</RuntimeLibrary>" ORIG "${ORIG}") endif() + if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic") + string(REPLACE + "<ConfigurationType>StaticLibrary</ConfigurationType>" + "<ConfigurationType>DynamicLibrary</ConfigurationType>" + ORIG "${ORIG}") + else() + string(REPLACE + "<ConfigurationType>DynamicLibrary</ConfigurationType>" + "<ConfigurationType>StaticLibrary</ConfigurationType>" + ORIG "${ORIG}") + endif() file(WRITE ${VCXPROJ_PATH} "${ORIG}") endfunction() |