File tree Expand file tree Collapse file tree 2 files changed +8
-6
lines changed Expand file tree Collapse file tree 2 files changed +8
-6
lines changed Original file line number Diff line number Diff line change @@ -253,7 +253,8 @@ jobs:
253
253
toolchain :
254
254
- {compiler: intel, version: '2024.1'}
255
255
# - {compiler: intel, version: '2025.0'} SegFault in disp/ncoord.f90 near 'do concurrent(tx = -rep_cn(1):rep_cn(1), &'
256
- - {compiler: intel, version: '2025.1'}
256
+ # - {compiler: intel, version: '2025.1'} # Worked fine as of Jul 2, 2025; commit d3f212ba83287290efafee6580670d02d7b2f49d
257
+ - {compiler: intel, version: '2025.2'}
257
258
env :
258
259
APT_PACKAGES : >-
259
260
intel-oneapi-mkl-${{ matrix.toolchain.version }} intel-oneapi-mkl-devel-${{ matrix.toolchain.version }}
Original file line number Diff line number Diff line change 20
20
package
21
21
methods
22
22
url
23
+ rev
23
24
)
24
25
string (TOLOWER "${package} " _pkg_lc )
25
26
string (TOUPPER "${package} " _pkg_uc )
@@ -45,7 +46,7 @@ foreach(method ${methods})
45
46
46
47
# pkgconf case
47
48
elseif ("${method} " STREQUAL "pkgconf" )
48
- find_package ("PkgConfig" QUIET ) # built-in Find script
49
+ find_package ("PkgConfig" QUIET ) # built-in Find script
49
50
pkg_check_modules ("${_pkg_uc} " QUIET "${package} " ) # check if it is a pkg-config module
50
51
if ("${_pkg_uc} _FOUND" )
51
52
message (STATUS "Found ${package} via pkg-config" )
@@ -70,11 +71,11 @@ foreach(method ${methods})
70
71
endif ()
71
72
set ("${_pkg_uc} _SOURCE_DIR" "${PROJECT_SOURCE_DIR} /${${_pkg_uc} _SUBPROJECT}" )
72
73
set ("${_pkg_uc} _BINARY_DIR" "${PROJECT_BINARY_DIR} /${${_pkg_uc} _SUBPROJECT}" )
73
-
74
+
74
75
# if can be configured from the subprojects dir
75
76
if (EXISTS "${${_pkg_uc} _SOURCE_DIR}/CMakeLists.txt" )
76
77
message (STATUS "Include ${package} from ${${_pkg_uc} _SUBPROJECT}" )
77
-
78
+
78
79
add_subdirectory (
79
80
"${${_pkg_uc} _SOURCE_DIR}"
80
81
"${${_pkg_uc} _BINARY_DIR}"
@@ -102,10 +103,10 @@ foreach(method ${methods})
102
103
FetchContent_Declare (
103
104
"${_pkg_lc} "
104
105
GIT_REPOSITORY "${url} "
105
- GIT_TAG "HEAD "
106
+ GIT_TAG "${rev} "
106
107
)
107
108
FetchContent_MakeAvailable ("${_pkg_lc} " )
108
-
109
+
109
110
add_library ("${package} ::${package} " INTERFACE IMPORTED )
110
111
target_link_libraries ("${package} ::${package} " INTERFACE "${package} " )
111
112
You can’t perform that action at this time.
0 commit comments