diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2019-06-19 13:28:41 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-06-19 13:28:40 -0700 |
| commit | d3498a8943b8af2fd37b287c766acff8d6623463 (patch) | |
| tree | 3267ebf24319f50f2657e7fa746b8a6af65d0f12 | |
| parent | 4b0b0c57314cc0d73f7a666a2bc476153d6b42a2 (diff) | |
| download | vcpkg-d3498a8943b8af2fd37b287c766acff8d6623463.tar.gz vcpkg-d3498a8943b8af2fd37b287c766acff8d6623463.zip | |
[msmpi] Fix /MD for static libs. (#6945)
* [msmpi] Fix /MD for static libs.
* [msmpi] Don't install static-crt static libs when using debug crt
| -rw-r--r-- | ports/msmpi/CONTROL | 2 | ||||
| -rw-r--r-- | ports/msmpi/portfile.cmake | 44 |
2 files changed, 17 insertions, 29 deletions
diff --git a/ports/msmpi/CONTROL b/ports/msmpi/CONTROL index 7a4b2d62e..d21b80c37 100644 --- a/ports/msmpi/CONTROL +++ b/ports/msmpi/CONTROL @@ -1,3 +1,3 @@ Source: msmpi -Version: 10.0 +Version: 10.0-2 Description: Microsoft MPI diff --git a/ports/msmpi/portfile.cmake b/ports/msmpi/portfile.cmake index 70c2ff5d9..c55a49412 100644 --- a/ports/msmpi/portfile.cmake +++ b/ports/msmpi/portfile.cmake @@ -95,40 +95,28 @@ file(INSTALL ${CURRENT_PACKAGES_DIR}/include ) -# Install release libraries +# NOTE: since the binary distribution does not include any debug libraries we always install the release libraries +SET(VCPKG_POLICY_ONLY_RELEASE_CRT enabled) + +file(GLOB STATIC_LIBS + ${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifec.lib + ${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifmc.lib + ${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifes.lib + ${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifms.lib +) + file(INSTALL "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpi.lib" - "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifec.lib" - "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifmc.lib" - DESTINATION - ${CURRENT_PACKAGES_DIR}/lib + DESTINATION ${CURRENT_PACKAGES_DIR}/lib ) -if(TRIPLET_SYSTEM_ARCH STREQUAL "x86") - file(INSTALL - "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifes.lib" - "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifms.lib" - DESTINATION - ${CURRENT_PACKAGES_DIR}/lib - ) -endif() - -# Install debug libraries -# NOTE: since the binary distribution does not include any debug libraries we simply install the release libraries -SET(VCPKG_POLICY_ONLY_RELEASE_CRT enabled) file(INSTALL "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpi.lib" - "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifec.lib" - "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifmc.lib" - DESTINATION - ${CURRENT_PACKAGES_DIR}/debug/lib + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib ) -if(TRIPLET_SYSTEM_ARCH STREQUAL "x86") - file(INSTALL - "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifes.lib" - "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifms.lib" - DESTINATION - ${CURRENT_PACKAGES_DIR}/debug/lib - ) + +if(VCPKG_CRT_LINKAGE STREQUAL "static") + file(INSTALL ${STATIC_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(INSTALL ${STATIC_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) endif() # Handle copyright |