Skip to content

Commit 77aed0e

Browse files
committed
Merge branch 'devel' into 'master' for 1.15.1 release
2 parents 8c6b37e + 9f1137b commit 77aed0e

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

.github/workflows/ci.linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
3131
with:
3232
image: rockylinux:8
33-
dpcpp-version: intel/2025.1
33+
dpcpp-version: intel/2025.2
3434
cmd: |
3535
export CC=icx
3636
export CXX=icpx

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
1414

1515
## Establish project ##
1616

17-
project(rkcommon VERSION 1.15.0 LANGUAGES CXX)
17+
project(rkcommon VERSION 1.15.1 LANGUAGES CXX)
1818

1919
include(GNUInstallDirs)
2020

cmake/rkcommon_macros.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ macro(rkcommon_configure_tasking_system)
142142
endif()
143143
endmacro()
144144

145+
include(CMakeFindDependencyMacro)
146+
145147
macro(rkcommon_create_tasking_target FROM_INSTALL)
146148
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
147149
set(THREADS_PREFER_PTHREAD_FLAG TRUE)

0 commit comments

Comments
 (0)