Skip to content
This repository was archived by the owner on Jun 30, 2025. It is now read-only.

Replace IPCL_IPPCRYPTO_PATH with CMAKE_PREFIX_PATH #39

Merged
merged 2 commits into from
Nov 22, 2022
Merged

Replace IPCL_IPPCRYPTO_PATH with CMAKE_PREFIX_PATH #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc254b7
Replace IPCL_IPPCRYPTO_PATH with CMAKE_PREFIX_PATH
Nov 22, 2022
7b26df8
Replace /opt/intel/ipp-crypto with /opt/intel
Nov 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX "/opt/intel/ipcl")
endif()

if(CMAKE_PREFIX_PATH)
message(STATUS "---- CMAKE_PREFIX_PATH is defined as ${CMAKE_PREFIX_PATH}")
else()
set(CMAKE_PREFIX_PATH $ENV{HOME}/intel /opt/intel)
Copy link
Contributor

@fdiasmor fdiasmor Nov 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this to read the dependencies that are installed during IPCL build/installation (CMAKE_INSTALL_PREFIX)?

endif()


set(CMAKE_C_FLAGS "-O2 -Wno-error=deprecated-declarations -Wno-error=deprecated-copy")
set(CMAKE_CXX_FLAGS "-O2 -fpermissive -Wno-error=deprecated-declarations -Wno-error=deprecated-copy")
set(CMAKE_INSTALL_RPATH "$ORIGIN;$ORIGIN/${CMAKE_INSTALL_LIBDIR};$ORIGIN/ippcrypto")
Expand Down Expand Up @@ -70,7 +77,6 @@ option(IPCL_DOCS "Enable document building" OFF)
option(IPCL_SHARED "Build shared library" ON)
option(IPCL_DETECT_CPU_RUNTIME "Detect CPU supported instructions during runtime" OFF)
option(IPCL_INTERNAL_PYTHON_BUILD "Additional steps for IPCL_Python build" OFF)
option(IPCL_IPPCRYPTO_PATH "Use pre-installed IPP-Crypto library" OFF)

# Used only for ipcl_python IPCL_INTERNAL_PYTHON_BUILD - additional check if invalid parameters
if(IPCL_INTERNAL_PYTHON_BUILD)
Expand Down
15 changes: 7 additions & 8 deletions cmake/ippcrypto.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,36 @@
include(ExternalProject)
message(STATUS "Configuring ipp-crypto")

if(IPCL_IPPCRYPTO_PATH)
set(IPPCRYPTO_VERSION 11.4)
set(IPPCRYPTO_GIT_LABEL ippcp_2021.6) #ippcp version 11.4

if(CMAKE_PREFIX_PATH)
if(IPCL_SHARED)
set(IPPCP_SHARED ON)
else()
set(IPPCP_SHARED OFF)
endif()

# ippcp version 11.4 - inline with ippcp_2021.6
find_package(ippcp 11.4 HINTS ${IPCL_IPPCRYPTO_PATH}/lib/cmake/ippcp)
find_package(ippcp ${IPPCRYPTO_VERSION})
endif()

if(ippcp_FOUND)
message(STATUS "IPP-Crypto Found - using pre-installed IPP-Crypto library")
message(STATUS "IPP-Crypto ${IPPCRYPTO_VERSION} found at ${ippcp_DIR}")
get_target_property(IPPCRYPTO_INC_DIR IPPCP::ippcp INTERFACE_INCLUDE_DIRECTORIES)
get_target_property(IPPCRYPTO_IMPORTED_LOCATION IPPCP::ippcp IMPORTED_LOCATION)
get_filename_component(IPPCRYPTO_LIB_DIR ${IPPCRYPTO_IMPORTED_LOCATION} DIRECTORY)

install(
DIRECTORY ${IPPCRYPTO_LIB_DIR}/
DESTINATION "${IPCL_INSTALL_LIBDIR}/ippcrypto"
USE_SOURCE_PERMISSIONS
)

else()
message(STATUS "IPP-Crypto NOT Found - building from source")
message(STATUS "IPP-Crypto NOT found - building from source")

set(IPPCRYPTO_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/ext_ipp-crypto)
set(IPPCRYPTO_DESTDIR ${IPPCRYPTO_PREFIX}/ippcrypto_install)
set(IPPCRYPTO_DEST_INCLUDE_DIR include/ippcrypto)
set(IPPCRYPTO_GIT_REPO_URL https://github.com/intel/ipp-crypto.git)
set(IPPCRYPTO_GIT_LABEL ippcp_2021.6) #ippcp version 11.4
set(IPPCRYPTO_SRC_DIR ${IPPCRYPTO_PREFIX}/src/ext_ipp-crypto/)

set(IPPCRYPTO_CXX_FLAGS "${IPCL_FORWARD_CMAKE_ARGS} -DNONPIC_LIB:BOOL=off -DMERGED_BLD:BOOL=on")
Expand Down