Skip to content

Commit

Permalink
Merge pull request #111 from krasznaa/ARM64Support-main-20231014
Browse files Browse the repository at this point in the history
  • Loading branch information
krasznaa authored Oct 31, 2023
2 parents 61c2cd2 + 6687bae commit 5dd6481
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- uses: actions/checkout@v2
# Run the CMake configuration.
- name: Configure
run: cmake --preset default
run: cmake --preset default-x86-64
-S ${{ github.workspace }} -B build
-G "${{ matrix.PLATFORM.GENERATOR }}"
# Perform the build.
Expand Down
9 changes: 7 additions & 2 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,15 @@
}
},
{
"name" : "default",
"displayName" : "Default Developer Configuration",
"name" : "default-x86-64",
"displayName" : "Default Developer Configuration for x86_64",
"inherits" : [ "vecmem", "eigen", "vc", "fastor" ]
},
{
"name" : "default-aarch64",
"displayName" : "Default Developer Configuration for ARM64",
"inherits" : [ "vecmem", "eigen", "vc" ]
},
{
"name" : "cuda",
"displayName" : "CUDA Developer Configuration",
Expand Down
11 changes: 8 additions & 3 deletions extern/fastor/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Algebra plugins library, part of the ACTS project (R&D line)
#
# (c) 2022 CERN for the benefit of the ACTS project
# (c) 2022-2023 CERN for the benefit of the ACTS project
#
# Mozilla Public License Version 2.0

Expand All @@ -11,6 +11,11 @@ include( FetchContent )
# Tell the user what's happening.
message( STATUS "Building Fastor as part of the Algebra Plugins project" )

# Warn the user, if they are not on an x86 platform.
if( NOT "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64" )
message( WARNING "Fastor is only supported on the x86 platforms" )
endif()

# Declare where to get Fastor from.
# We need to use this alternative syntax for FetchContent_Declare because the
# latest release for Fastor does not have a CMakeLists.txt file.
Expand Down Expand Up @@ -40,8 +45,8 @@ endif()

# Treat the Fastor headers as "system headers", to avoid getting warnings from
# them.
get_target_property( _incDirs Fastor INTERFACE_INCLUDE_DIRECTORIES )
target_include_directories( Fastor
get_target_property( _incDirs Fastor INTERFACE_INCLUDE_DIRECTORIES )
target_include_directories( Fastor
SYSTEM INTERFACE ${_incDirs} )
unset( _incDirs )

Expand Down

0 comments on commit 5dd6481

Please sign in to comment.