diff --git a/.github/workflows/ci.linux.yml b/.github/workflows/ci.linux.yml index 31d10b9..1548379 100644 --- a/.github/workflows/ci.linux.yml +++ b/.github/workflows/ci.linux.yml @@ -30,15 +30,23 @@ jobs: uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main with: image: rockylinux:8 - dpcpp-version: intel/2025.2 + dpcpp-version: intel/2025.3 cmd: | - export CC=icx - export CXX=icpx export LDFLAGS="-static-intel" .github/scripts/build.sh artifact-out: build-rocky8-icx artifact-path: build + build-rocky8-dpcpp: + uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main + with: + image: rockylinux:8 + dpcpp-version: intel-llvm/v7.0.0 + cmd: | + .github/scripts/build.sh + artifact-out: build-rocky8-dpcpp + artifact-path: build + build-rocky9: uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main with: @@ -129,6 +137,15 @@ jobs: ./build/rkcommon_test_suite artifact-in: build-rocky8-icx + test-rocky8-dpcpp: + needs: build-rocky8-dpcpp + uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main + with: + image: rockylinux:8 + cmd: | + ./build/rkcommon_test_suite + artifact-in: build-rocky8-dpcpp + test-rocky9: needs: build-rocky9 uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main diff --git a/.github/workflows/ci.windows.yml b/.github/workflows/ci.windows.yml index fd3b650..da85758 100644 --- a/.github/workflows/ci.windows.yml +++ b/.github/workflows/ci.windows.yml @@ -17,14 +17,6 @@ jobs: ## Build Jobs ## - build-windows-msvc15: - uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main - with: - cmd: | - .github\scripts\build.ps1 "Visual Studio 15 2017 Win64" - artifact-out: build-windows-msvc15 - artifact-path: build - build-windows-msvc16: uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: @@ -43,14 +35,6 @@ jobs: ## Functional Test Jobs ## - test-windows-msvc15: - needs: build-windows-msvc15 - uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main - with: - cmd: | - .github\scripts\run_tests.ps1 - artifact-in: build-windows-msvc15 - test-windows-msvc16: needs: build-windows-msvc16 uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main diff --git a/CMakeLists.txt b/CMakeLists.txt index c2fb3ca..1f48243 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) ## Establish project ## -project(rkcommon VERSION 1.15.2 LANGUAGES CXX) +project(rkcommon VERSION 1.15.3 LANGUAGES CXX) include(GNUInstallDirs) diff --git a/cmake/rkcommon_macros.cmake b/cmake/rkcommon_macros.cmake index 042b509..2173c6b 100644 --- a/cmake/rkcommon_macros.cmake +++ b/cmake/rkcommon_macros.cmake @@ -100,6 +100,9 @@ macro(rkcommon_configure_compiler) elseif(RKCOMMON_COMPILER_DPCPP) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /Qoption,link,/DEPENDENTLOADFLAG:0x2000") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /Qoption,link,/DEPENDENTLOADFLAG:0x2000") + elseif(RKCOMMON_COMPILER_CLANG) # e.g. DPC++ used via clang++ + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Xlinker /DEPENDENTLOADFLAG:0x2000") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker /DEPENDENTLOADFLAG:0x2000") else() message(WARNING "Unrecognized WIN32 compiler, DEPENDENTLOADFLAG can't be set") endif()