Skip to content
This repository was archived by the owner on Jun 30, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions cmake/cpufeatures.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# SPDX-License-Identifier: Apache-2.0

include(ExternalProject)
include(GNUInstallDirs)

message(STATUS "configuring cpu_features")
set(CPUFEATURES_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/ext_cpufeatures)
Expand All @@ -20,14 +19,15 @@ ExternalProject_Add(
-DCMAKE_BUILD_TYPE=Release
-DBUILD_TESTING=OFF
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DCMAKE_INSTALL_LIBDIR=lib
UPDATE_COMMAND ""
EXCLUDE_FROM_ALL TRUE
INSTALL_COMMAND make DESTDIR=${CPUFEATURES_DESTDIR} install
)


set(CPUFEATURES_INC_DIR ${CPUFEATURES_DESTDIR}/${CMAKE_INSTALL_PREFIX}/include)
set(CPUFEATURES_LIB_DIR ${CPUFEATURES_DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
set(CPUFEATURES_LIB_DIR ${CPUFEATURES_DESTDIR}/${CMAKE_INSTALL_PREFIX}/lib)

if(IPCL_SHARED)
add_library(libcpu_features INTERFACE)
Expand All @@ -40,7 +40,7 @@ if(IPCL_SHARED)

install(
DIRECTORY ${CPUFEATURES_LIB_DIR}/
DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cpufeatures"
DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/cpufeatures"
USE_SOURCE_PERMISSIONS
)
else()
Expand Down
4 changes: 2 additions & 2 deletions cmake/gbenchmark.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# SPDX-License-Identifier: Apache-2.0

include(ExternalProject)
include(GNUInstallDirs)

set(GBENCHMARK_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/ext_gbenchmark)

Expand All @@ -23,6 +22,7 @@ ExternalProject_Add(
-DCMAKE_INSTALL_PREFIX=${GBENCHMARK_PREFIX}
-DBENCHMARK_ENABLE_GTEST_TESTS=OFF
-DBENCHMARK_ENABLE_TESTING=OFF
-DCMAKE_INSTALL_LIBDIR=lib
-DCMAKE_BUILD_TYPE=Release
BUILD_BYPRODUCTS ${GBENCHMARK_PATHS}
# Skip updates
Expand All @@ -33,7 +33,7 @@ ExternalProject_Add(
add_library(libgbenchmark INTERFACE)
add_dependencies(libgbenchmark ext_gbenchmark)

target_link_libraries(libgbenchmark INTERFACE ${GBENCHMARK_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libbenchmark.a)
target_link_libraries(libgbenchmark INTERFACE ${GBENCHMARK_PREFIX}/lib/libbenchmark.a)

target_include_directories(libgbenchmark SYSTEM
INTERFACE ${GBENCHMARK_PREFIX}/include)
2 changes: 1 addition & 1 deletion cmake/gtest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# SPDX-License-Identifier: Apache-2.0

include(ExternalProject)
include(GNUInstallDirs)

set(GTEST_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/ext_gtest)
set(GTEST_GIT_REPO_URL https://github.com/google/googletest.git)
Expand All @@ -16,6 +15,7 @@ ExternalProject_Add(
GIT_TAG ${GTEST_GIT_LABEL}
CMAKE_ARGS ${GTEST_CXX_FLAGS} -DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DCMAKE_INSTALL_LIBDIR=lib
UPDATE_COMMAND ""
EXCLUDE_FROM_ALL TRUE
INSTALL_COMMAND ""
Expand Down
5 changes: 3 additions & 2 deletions cmake/ippcrypto.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@ ExternalProject_Add(
-DCMAKE_ASM_NASM_COMPILER=nasm
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DCMAKE_INSTALL_LIBDIR=lib
UPDATE_COMMAND ""
INSTALL_COMMAND make DESTDIR=${IPPCRYPTO_DESTDIR} install
)

set(IPPCRYPTO_INC_DIR ${IPPCRYPTO_DESTDIR}/${CMAKE_INSTALL_PREFIX}/include)
set(IPPCRYPTO_LIB_DIR ${IPPCRYPTO_DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${IPPCRYPTO_ARCH})
set(IPPCRYPTO_LIB_DIR ${IPPCRYPTO_DESTDIR}/${CMAKE_INSTALL_PREFIX}/lib/${IPPCRYPTO_ARCH})
if(IPCL_SHARED)
add_library(libippcrypto INTERFACE)
add_dependencies(libippcrypto ext_ipp-crypto)
Expand All @@ -51,7 +52,7 @@ if(IPCL_SHARED)

install(
DIRECTORY ${IPPCRYPTO_LIB_DIR}/
DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/ippcrypto"
DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/ippcrypto"
USE_SOURCE_PERMISSIONS
)
else()
Expand Down