Skip to content

Commit 0e38454

Browse files
authored
Update build system (#1324)
* Add rev argument Signed-off-by: Igor S. Gerasimov <foxtranigor@gmail.com> * Remove trailing whitespaces Signed-off-by: Igor S. Gerasimov <foxtranigor@gmail.com> * Switch to new ifx version Signed-off-by: Igor S. Gerasimov <foxtranigor@gmail.com> --------- Signed-off-by: Igor S. Gerasimov <foxtranigor@gmail.com>
1 parent d3f212b commit 0e38454

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.github/workflows/fortran-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,8 @@ jobs:
253253
toolchain:
254254
- {compiler: intel, version: '2024.1'}
255255
# - {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'}
257258
env:
258259
APT_PACKAGES: >-
259260
intel-oneapi-mkl-${{ matrix.toolchain.version }} intel-oneapi-mkl-devel-${{ matrix.toolchain.version }}

cmake/modules/xtb-utils.cmake

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ macro(
2020
package
2121
methods
2222
url
23+
rev
2324
)
2425
string(TOLOWER "${package}" _pkg_lc)
2526
string(TOUPPER "${package}" _pkg_uc)
@@ -45,7 +46,7 @@ foreach(method ${methods})
4546

4647
# pkgconf case
4748
elseif("${method}" STREQUAL "pkgconf")
48-
find_package("PkgConfig" QUIET) # built-in Find script
49+
find_package("PkgConfig" QUIET) # built-in Find script
4950
pkg_check_modules("${_pkg_uc}" QUIET "${package}") # check if it is a pkg-config module
5051
if("${_pkg_uc}_FOUND")
5152
message(STATUS "Found ${package} via pkg-config")
@@ -70,11 +71,11 @@ foreach(method ${methods})
7071
endif()
7172
set("${_pkg_uc}_SOURCE_DIR" "${PROJECT_SOURCE_DIR}/${${_pkg_uc}_SUBPROJECT}")
7273
set("${_pkg_uc}_BINARY_DIR" "${PROJECT_BINARY_DIR}/${${_pkg_uc}_SUBPROJECT}")
73-
74+
7475
# if can be configured from the subprojects dir
7576
if(EXISTS "${${_pkg_uc}_SOURCE_DIR}/CMakeLists.txt")
7677
message(STATUS "Include ${package} from ${${_pkg_uc}_SUBPROJECT}")
77-
78+
7879
add_subdirectory(
7980
"${${_pkg_uc}_SOURCE_DIR}"
8081
"${${_pkg_uc}_BINARY_DIR}"
@@ -102,10 +103,10 @@ foreach(method ${methods})
102103
FetchContent_Declare(
103104
"${_pkg_lc}"
104105
GIT_REPOSITORY "${url}"
105-
GIT_TAG "HEAD"
106+
GIT_TAG "${rev}"
106107
)
107108
FetchContent_MakeAvailable("${_pkg_lc}")
108-
109+
109110
add_library("${package}::${package}" INTERFACE IMPORTED)
110111
target_link_libraries("${package}::${package}" INTERFACE "${package}")
111112

0 commit comments

Comments
 (0)