Skip to content

Commit e94647d

Browse files
committed
Change linking to static for ICX Intel libraries
1 parent da8cfb8 commit e94647d

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

.github/workflows/reusable_basic.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,7 @@ jobs:
182182
- name: Run tests
183183
working-directory: ${{env.BUILD_DIR}}
184184
run: |
185-
${{ matrix.compiler.cxx == 'icpx' && '. /opt/intel/oneapi/setvars.sh' || true }}
186-
ctest --output-on-failure # run all tests for better coverage
185+
LD_LIBRARY_PATH=${{env.BUILD_DIR}}/lib/ ctest --output-on-failure # run all tests for better coverage
187186
188187
- name: Check coverage
189188
if: ${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' }}

.github/workflows/reusable_sanitizers.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ jobs:
7777
ASAN_OPTIONS: allocator_may_return_null=1
7878
TSAN_OPTIONS: allocator_may_return_null=1
7979
run: |
80-
${{ matrix.compiler.cxx == 'icpx' && '. /opt/intel/oneapi/setvars.sh' || true }}
8180
ctest --output-on-failure
8281
8382
windows-build:

CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ include(CMakePackageConfigHelpers)
3333
include(GNUInstallDirs)
3434
find_package(PkgConfig)
3535

36+
if(CMAKE_C_COMPILER_ID STREQUAL "IntelLLVM")
37+
# Compiler dependencies needs to be in library path or to be linked
38+
# statically
39+
add_link_options(-static-intel)
40+
endif()
41+
3642
# Build Options
3743
option(UMF_BUILD_SHARED_LIBRARY "Build UMF as shared library" OFF)
3844
option(UMF_BUILD_LEVEL_ZERO_PROVIDER "Build Level Zero memory provider" ON)

test/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1-
# Copyright (C) 2022-2024 Intel Corporation
1+
# Copyright (C) 2022-2025 Intel Corporation
22
# Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
33
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
44

55
set(CMAKE_CXX_STANDARD 17)
66
set(CMAKE_CXX_STANDARD_REQUIRED YES)
77

8+
if(CMAKE_C_COMPILER_ID STREQUAL "IntelLLVM")
9+
# Compiler dependencies needs to be in library path or to be linked
10+
# statically
11+
add_link_options(-static-intel)
12+
endif()
13+
814
include(FetchContent)
915
FetchContent_Declare(
1016
googletest

0 commit comments

Comments
 (0)