Update intel-ipsec to 1.1, fix cmake configs, and support Windows. (#22269)

* update intel-ipsec to v1.1 * Update portfile.cmake, correct the install file path * Add more double quotes * Revert changes about double quotes * version * [intel-ipsec] Overhaul/modernize port. * Remove CMakeLists.txt replacement that was a fancy way to say vcpkg_from_make/vcpkg_from_nmake. * Convert support messages into a "supports" expression. * Fix Windows. * Correct CMake config handling of release/debug static/shared and Windows. * Remove attempt to copy nonexistent PDBs. * Apply CR feedback from Nicole and dg0yt * Add if(TARGET * Update always-generate-PDB patch with the version actually merged upstream. Co-authored-by: Mengna-Li <you@example.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2024-11-24 03:09:00 +08:00 · 2022-01-24 16:30:52 -08:00 · 2022-01-24 16:30:52 -08:00 · b18b17865c
commit b18b17865c
parent 9b0c7e7b76
11 changed files with 213 additions and 140 deletions
--- a/ports/intel-ipsec/CMakeLists.txt
+++ b/ports/intel-ipsec/CMakeLists.txt
@ -1,59 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.9)
-PROJECT(ipsec C)
-
-IF (SOURCE_PATH)
-    SET(CMAKE_SOURCE_DIR ${SOURCE_PATH})
-ENDIF ()
-
-INCLUDE(ProcessorCount)
-PROCESSORCOUNT(PROCS)
-
-FIND_PROGRAM(NASM nasm)
-IF (NOT NASM)
-    MESSAGE(FATAL_ERROR "NASM not found")
-ENDIF ()
-
-FIND_PROGRAM(MAKE make)
-IF (NOT MAKE)
-    MESSAGE(FATAL_ERROR "MAKE not found")
-ENDIF ()
-
-IF (EXEC_ENV STREQUAL "Windows")
-    FIND_PROGRAM(MAKE nmake)
-    IF (NOT MAKE)
-        MESSAGE(FATAL_ERROR "nmake not found")
-    ENDIF ()
-ENDIF ()
-
-SET(MAKE_FLAGS)
-
-IF (EXEC_ENV STREQUAL Windows)
-    LIST(APPEND MAKE_FLAGS /f win_x64.mak)
-ENDIF ()
-
-IF (CMAKE_BUILD_TYPE STREQUAL Debug)
-    LIST(APPEND MAKE_FLAGS DEBUG=y)
-ENDIF ()
-
-IF (LIBRARY_LINKAGE STREQUAL "static")
-    LIST(APPEND MAKE_FLAGS SHARED=n)
-ENDIF ()
-
-MESSAGE(STATUS "${MAKE_FLAGS}")
-ADD_CUSTOM_TARGET(ipsec-mb ALL
-                  COMMAND ${MAKE} -j ${MAKE_FLAGS}
-                  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/
-#                  VERBATIM
-                  )
-
-SET(LIB_PATH ${CMAKE_SOURCE_DIR}/)
-IF (LIBRARY_LINKAGE STREQUAL "dynamic")
-    STRING(APPEND LIB_PATH libIPSec_MB.so)
-ELSEIF (LIBRARY_LINKAGE STREQUAL "static")
-    STRING(APPEND LIB_PATH libIPSec_MB.a)
-ELSE ()
-    MESSAGE(FATAL_ERROR "Unknown linkage type ${LIBRARY_LINKAGE}")
-ENDIF ()
-INSTALL(FILES ${LIB_PATH}
-        DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/lib/)
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/)
--- a/ports/intel-ipsec/always-generate-pdb.patch
+++ b/ports/intel-ipsec/always-generate-pdb.patch
@ -0,0 +1,80 @@
+From 19d3b3fca689fb87e819b0b27bc74d1f52fcd2c8 Mon Sep 17 00:00:00 2001
+From: Billy Robert O'Neal III <bion@microsoft.com>
+Date: Wed, 12 Jan 2022 12:40:30 +0000
+Subject: [PATCH] lib: generate PDB in release build on Windows
+
+PDBs are necessary for postmortem debugging and for teams to get reports
+from Watson, so they should be built for released software too. This
+change always passes /DEBUG to the MSVC linker. That switch controls
+whether a PDB is generated (as in "generate debugging information") not
+a statement that the resulting files are the debug specific version of
+your library.
+
+/DEBUG changes the default values of /INCREMENTAL (to on) and /OPT:REF
+and /OPT:ICF to off, so those are changed back to incremental off and
+linker optimizations on in debug builds.
+
+This missing PDB issue was discovered in fixing intel-ipsec's port in
+vcpkg to build on Windows (https://github.com/microsoft/vcpkg/pull/22269).
+
+intel-ipsec-mb vcpkg PR link is https://github.com/microsoft/vcpkg/pull/5586
+---
+ lib/win_x64.mak | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/lib/win_x64.mak b/lib/win_x64.mak
+index 89162feb..bb62b2ea 100644
+--- a/lib/win_x64.mak
+++ b/lib/win_x64.mak
+@@ -12,7 +12,7 @@
+ #     * Neither the name of Intel Corporation nor the names of its contributors
+ #       may be used to endorse or promote products derived from this software
+ #       without specific prior written permission.
+-# 
+#
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+@@ -71,14 +71,14 @@ LIB_DIR = .\
+ 
+ !ifdef DEBUG
+ OPT = $(DEBUG_OPT)
+-DCFLAGS = /DDEBUG /Z7
+DCFLAGS = /DDEBUG
+ DAFLAGS = -gcv8
+-DLFLAGS = /DEBUG
+DLFLAGS = /DEBUG /INCREMENTAL:NO
+ !else
+ OPT = /O2 /Oi
+ DCFLAGS =
+ DAFLAGS =
+-DLFLAGS = /RELEASE
+DLFLAGS = /RELEASE /DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO
+ !endif
+ 
+ !if "$(SAFE_DATA)" != "n"
+@@ -98,7 +98,7 @@ DAFLAGS = $(DAFLAGS) -DSAFE_LOOKUP
+ 
+ CC = cl
+ CFLAGS_ALL = $(EXTRA_CFLAGS) /DNO_COMPAT_IMB_API_053 /I. /Iinclude /Ino-aesni \
+-	/nologo /Y- /W3 /WX- /Gm- /fp:precise /EHsc
+	/nologo /Y- /W3 /WX- /Gm- /fp:precise /EHsc /Z7
+ 
+ CFLAGS = $(CFLAGS_ALL) $(OPT) $(DCFLAGS)
+ CFLAGS_NO_SIMD = $(CFLAGS_ALL) /Od $(DCFLAGS)
+@@ -633,6 +633,7 @@ install:
+ 	-copy /Y /V /B $(LIBBASE).lib "$(INSTDIR)"
+ 	-copy /Y /V /A intel-ipsec-mb.h "$(INSTDIR)"
+ !if "$(SHARED)" == "y"
+	-copy /Y /V /B $(LIB_DIR)\$(LIBBASE).pdb "$(INSTDIR)"
+ 	-copy /Y /V /B $(LIB_DIR)\$(LIBBASE).dll "$(INSTDIR)"
+ 	-copy /Y /V /B $(LIB_DIR)\$(LIBBASE).dll "%windir%\system32"
+ !endif
+@@ -641,6 +642,7 @@ uninstall:
+ !if "$(SHARED)" == "y"
+ 	-del /Q "%windir%\system32\$(LIBBASE).dll"
+ 	-del /Q "$(INSTDIR)\$(LIBBASE).dll"
+	-del /Q "$(INSTDIR)\$(LIBBASE).pdb"
+ !endif
+ 	-del /Q "$(INSTDIR)\$(LIBBASE).def"
+ 	-del /Q "$(INSTDIR)\$(LIBBASE).exp"
--- a/ports/intel-ipsec/intel-ipsec-targets-implib.cmake.in
+++ b/ports/intel-ipsec/intel-ipsec-targets-implib.cmake.in
@ -0,0 +1,5 @@
+set_property(TARGET IPSEC::ipsec APPEND PROPERTY IMPORTED_CONFIGURATIONS @INTEL_IPSEC_CONFIGURATION@)
+set_target_properties(IPSEC::ipsec PROPERTIES
+    IMPORTED_LOCATION_@INTEL_IPSEC_CONFIGURATION@ "${_IMPORT_PREFIX}/@INTEL_IPSEC_LOCATION@"
+    IMPORTED_IMPLIB_@INTEL_IPSEC_CONFIGURATION@ "${_IMPORT_PREFIX}/@INTEL_IPSEC_IMPLIB@"
+    )
--- a/ports/intel-ipsec/intel-ipsec-targets.cmake.in
+++ b/ports/intel-ipsec/intel-ipsec-targets.cmake.in
@ -0,0 +1,4 @@
+set_property(TARGET IPSEC::ipsec APPEND PROPERTY IMPORTED_CONFIGURATIONS @INTEL_IPSEC_CONFIGURATION@)
+set_target_properties(IPSEC::ipsec PROPERTIES
+    IMPORTED_LOCATION_@INTEL_IPSEC_CONFIGURATION@ "${_IMPORT_PREFIX}/@INTEL_IPSEC_LOCATION@"
+    )
--- a/ports/intel-ipsec/intel-ipsecConfig.cmake
+++ b/ports/intel-ipsec/intel-ipsecConfig.cmake
@ -1,17 +0,0 @@
-
-FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR)
-    ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED)
-    SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES
-                          IMPORTED_CONFIGURATIONS "RELEASE;DEBUG"
-                          IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}"
-                          IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}"
-                          INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}"
-                          )
-    SET(${NAMESPACE}_${LIB_NAME}_FOUND 1)
-ENDFUNCTION()
-
-GET_FILENAME_COMPONENT(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH)
-GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH)
-GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH)
-
-SET_LIBRARY_TARGET("IPSEC" "ipsec" "${ROOT}/debug/lib/libIPSec_MB.a" "${ROOT}/lib/libIPSec_MB.a" "${ROOT}/include/intel-ipsec")
--- a/ports/intel-ipsec/intel-ipsecConfig.cmake.in
+++ b/ports/intel-ipsec/intel-ipsecConfig.cmake.in
@ -0,0 +1,16 @@
+if(TARGET IPSEC::ipsec)
+    return()
+endif()
+
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) # intel-ipsec
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) # share
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) # package root
+add_library(IPSEC::ipsec @INTEL_IPSEC_STATIC_OR_SHARED@ IMPORTED)
+set_target_properties(IPSEC::ipsec PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include")
+set(IPSEC_ipsec_FOUND 1)
+
+get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+file(GLOB CONFIG_FILES "${_DIR}/intel-ipsec-targets-*.cmake")
+foreach(f ${CONFIG_FILES})
+    include(${f})
+endforeach()
--- a/ports/intel-ipsec/portfile.cmake
+++ b/ports/intel-ipsec/portfile.cmake
@ -1,58 +1,105 @@
-IF (VCPKG_TARGET_IS_WINDOWS)
-    SET(EXEC_ENV "Windows")
-ELSE ()
-    SET(EXEC_ENV "${VCPKG_CMAKE_SYSTEM_NAME}")
-ENDIF ()
-
-IF (NOT EXEC_ENV STREQUAL "Linux")
-    MESSAGE(FATAL_ERROR "Intel(R) Multi-Buffer Crypto for IPsec Library currently only supports Linux/Windows platforms")
-    MESSAGE(STATUS "Well, it is not true, but I didnt manage to get it working on Windows")
-ENDIF ()
-
-IF (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
-    MESSAGE(FATAL_ERROR "Intel(R) Multi-Buffer Crypto for IPsec Library currently only supports x64 architecture")
-ELSEIF (NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    MESSAGE(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
-ENDIF ()
-
-VCPKG_FROM_GITHUB(
-        OUT_SOURCE_PATH SOURCE_PATH
-        REPO intel/intel-ipsec-mb
-        REF v0.52
-        SHA512 3b115fb6df53801800a63a3b62198165824a9262d579a7696f1ec365a5680282b172ffac742fe6453ae53b97043c19136adf558a85a0e51d163b27be2abc9e63
-        HEAD_REF master
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO intel/intel-ipsec-mb
+    REF bde82c8737edc04d80549f0a68225ede7e5cefd #v1.1
+    SHA512 f41dcde88b062e8ec2327987c6d36cd4f74a5e4fea386cc1ef8364f1dc432a2db02ca7d3312c0471b443cf93e815af6d74a4819c249afd6777aa91693b2546e5
+    HEAD_REF master
+    PATCHES
+        always-generate-pdb.patch # https://github.com/intel/intel-ipsec-mb/pull/93
 )

-VCPKG_FIND_ACQUIRE_PROGRAM(NASM)
+vcpkg_find_acquire_program(NASM)
+get_filename_component(NASM_DIR "${NASM}" DIRECTORY)
+vcpkg_add_to_path(PREPEND "${NASM_DIR}")

-EXEC_PROGRAM(${NASM}
-             ARGS -v
-             OUTPUT_VARIABLE NASM_OUTPUT
-             )
-STRING(REGEX REPLACE "NASM version ([0-9]+\\.[0-9]+\\.[0-9]+).*" "\\1"
-       NASM_VERSION
-       ${NASM_OUTPUT})
-IF (NASM_VERSION VERSION_LESS 2.13.03)
-    MESSAGE(FATAL_ERROR "NASM version 2.13.03 (or newer) is required to build this package")
-ENDIF ()
+vcpkg_list(SET MAKE_OPTIONS)
+set(INTEL_IPSEC_STATIC_OR_SHARED SHARED)
+if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static")
+    vcpkg_list(APPEND MAKE_OPTIONS SHARED=n)
+    set(INTEL_IPSEC_STATIC_OR_SHARED STATIC)
+endif()

-GET_FILENAME_COMPONENT(NASM_PATH ${NASM} DIRECTORY)
-SET(ENV{PATH} " $ENV{PATH};${NASM_PATH} ")
+set(DEBUG_LIB "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib")
+set(RELEASE_LIB "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib")

-VCPKG_CONFIGURE_CMAKE(
-        SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR}
-        PREFER_NINJA
-        OPTIONS
-        -DSOURCE_PATH=${SOURCE_PATH}
-        -DEXEC_ENV=${VCPKG_CMAKE_SYSTEM_NAME}
-        -DLIBRARY_LINKAGE=${VCPKG_LIBRARY_LINKAGE}
-)
+if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    vcpkg_build_nmake(
+        SOURCE_PATH "${SOURCE_PATH}"
+        PROJECT_SUBPATH lib
+        PROJECT_NAME win_x64.mak
+        OPTIONS ${MAKE_OPTIONS}
+        OPTIONS_DEBUG DEBUG=y
+    )

-VCPKG_INSTALL_CMAKE()
+    if(NOT "${VCPKG_BUILD_TYPE}" STREQUAL "release")
+        file(INSTALL "${DEBUG_LIB}/libIPSec_MB.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+        set(INTEL_IPSEC_CONFIGURATION "DEBUG")
+        if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static")
+            set(INTEL_IPSEC_LOCATION "debug/lib/libIPSec_MB.lib")
+            configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-debug.cmake" @ONLY)
+        else()
+            file(INSTALL "${DEBUG_LIB}/libIPSec_MB.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+            file(INSTALL "${DEBUG_LIB}/libIPSec_MB.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+            file(INSTALL "${DEBUG_LIB}/libIPSec_MB.exp" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+            set(INTEL_IPSEC_LOCATION "debug/bin/libIPSec_MB.dll")
+            set(INTEL_IPSEC_IMPLIB "debug/lib/libIPSec_MB.lib")
+            configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets-implib.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-debug.cmake" @ONLY)
+        endif()
+    endif()

-FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-FILE(INSTALL ${SOURCE_PATH}/Release/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})
-FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/intel-ipsecConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-FILE(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+    file(INSTALL "${RELEASE_LIB}/libIPSec_MB.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+    set(INTEL_IPSEC_CONFIGURATION "RELEASE")
+    if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static")
+        set(INTEL_IPSEC_LOCATION "lib/libIPSec_MB.lib")
+        configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-release.cmake" @ONLY)
+    else()
+        file(INSTALL "${RELEASE_LIB}/libIPSec_MB.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+        file(INSTALL "${RELEASE_LIB}/libIPSec_MB.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+        file(INSTALL "${RELEASE_LIB}/libIPSec_MB.exp" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+        set(INTEL_IPSEC_LOCATION "bin/libIPSec_MB.dll")
+        set(INTEL_IPSEC_IMPLIB "lib/libIPSec_MB.lib")
+        configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets-implib.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-release.cmake" @ONLY)
+    endif()
+else()
+    if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static")
+        set(LIB_SUFFIX ".a")
+    else()
+        set(LIB_SUFFIX ".so")
+    endif()
+
+    find_program(MAKE make REQUIRED)
+    if(NOT "${VCPKG_BUILD_TYPE}" STREQUAL "release")
+        message(STATUS "Building ${TARGET_TRIPLET}-dbg")
+        set(INTEL_IPSEC_CONFIGURATION "DEBUG")
+        file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
+        file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
+        vcpkg_execute_build_process(
+            COMMAND "${MAKE}" "-j${VCPKG_CONCURRENCY}" ${MAKE_OPTIONS}
+            WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib"
+            LOGNAME "build-${TARGET_TRIPLET}-dbg"
+        )
+
+        file(INSTALL "${DEBUG_LIB}/libIPSec_MB${LIB_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+        set(INTEL_IPSEC_LOCATION "debug/lib/libIPSec_MB${LIB_SUFFIX}")
+        configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-debug.cmake" @ONLY)
+    endif()
+
+    message(STATUS "Building ${TARGET_TRIPLET}-rel")
+    set(INTEL_IPSEC_CONFIGURATION "RELEASE")
+    file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
+    file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
+    vcpkg_execute_build_process(
+        COMMAND "${MAKE}" -j ${MAKE_OPTIONS}
+        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib"
+        LOGNAME "build-${TARGET_TRIPLET}-rel"
+    )
+
+    file(INSTALL "${RELEASE_LIB}/libIPSec_MB${LIB_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+    set(INTEL_IPSEC_LOCATION "lib/libIPSec_MB${LIB_SUFFIX}")
+    configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-release.cmake" @ONLY)
+endif()
+
+file(INSTALL "${SOURCE_PATH}/lib/intel-ipsec-mb.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsecConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsecConfig.cmake" @ONLY)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
--- a/ports/intel-ipsec/vcpkg.json
+++ b/ports/intel-ipsec/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "intel-ipsec",
-  "version-string": "0.52",
-  "port-version": 2,
-  "description": "Intel(R) Multi-Buffer Crypto for IPsec Library"
+  "version": "1.1",
+  "description": "Intel(R) Multi-Buffer Crypto for IPsec Library",
+  "supports": "x64 & (windows | linux) & !uwp"
 }
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@ -426,14 +426,6 @@ ijg-libjpeg:x64-uwp            = skip
 ijg-libjpeg:x64-windows        = skip
 ijg-libjpeg:x64-windows-static = skip
 ijg-libjpeg:x86-windows        = skip
-intel-ipsec:arm64-windows=fail
-intel-ipsec:arm-uwp=fail
-intel-ipsec:x64-osx=fail
-intel-ipsec:x64-uwp=fail
-intel-ipsec:x64-windows=fail
-intel-ipsec:x64-windows-static=fail
-intel-ipsec:x64-windows-static-md=fail
-intel-ipsec:x86-windows=fail
 intel-mkl:arm64-windows=fail
 intel-mkl:arm-uwp=fail
 intel-mkl:x64-linux=fail
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -2897,8 +2897,8 @@
      "port-version": 0
    },
    "intel-ipsec": {
-      "baseline": "0.52",
-      "port-version": 2
+      "baseline": "1.1",
+      "port-version": 0
    },
    "intel-mkl": {
      "baseline": "2020.0.0",
--- a/versions/i-/intel-ipsec.json
+++ b/versions/i-/intel-ipsec.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "fd3b71153cb4510e0de7475975f85bbbe41e9747",
+      "version": "1.1",
+      "port-version": 0
+    },
    {
      "git-tree": "39c4caebc1d5e618dcc455c9b7accb7fb2693f39",
      "version-string": "0.52",