File tree Expand file tree Collapse file tree 2 files changed +8
-17
lines changed
src/tests/integration/pde_solvers/navier-stokes Expand file tree Collapse file tree 2 files changed +8
-17
lines changed Original file line number Diff line number Diff line change @@ -169,15 +169,10 @@ if(opencoarrays_aware_compiler)
169
169
add_mpi_test (hello_multiverse 2 ${tests_root} /integration/coarrayHelloWorld/hello_multiverse )
170
170
add_mpi_test (coarray_burgers_pde 2 ${tests_root} /integration/pde_solvers/coarrayBurgers/coarray_burgers_pde )
171
171
add_mpi_test (co_heat 2 ${tests_root} /integration/pde_solvers/coarrayHeatSimplified/co_heat )
172
-
173
- execute_process (COMMAND uname -m
174
- OUTPUT_VARIABLE MACHINE_TYPE )
175
- if ("${CMAKE_SYSTEM_NAME} " MATCHES "Linux" )
176
- if ("${MACHINE_TYPE} " MATCHES "x86_64" )
177
- if ( NOT (DEFINED ENV{TRAVIS} ))
178
- add_mpi_test (coarray_navier_stokes 2 ${tests_root} /integration/pde_solvers/navier-stokes/coarray_navier_stokes )
179
- set_property (TEST coarray_navier_stokes PROPERTY PASS_REGULAR_EXPRESSION "Test passed." )
180
- endif ()
172
+ if ( ("${CMAKE_SYSTEM_PROCESSOR} " MATCHES "x86_64" ) AND ("${CMAKE_SYSTEM_NAME} " MATCHES "Linux" ) )
173
+ if ( NOT (DEFINED ENV{TRAVIS} ))
174
+ add_mpi_test (coarray_navier_stokes 2 ${tests_root} /integration/pde_solvers/navier-stokes/coarray_navier_stokes )
175
+ set_property (TEST coarray_navier_stokes PROPERTY PASS_REGULAR_EXPRESSION "Test passed." )
181
176
endif ()
182
177
endif ()
183
178
else ()
Original file line number Diff line number Diff line change 1
- if ("${CMAKE_SYSTEM_NAME} " MATCHES "Linux" )
2
- execute_process (COMMAND uname -m
3
- OUTPUT_VARIABLE MACHINE_TYPE )
4
- # checking whether the machine is of type 64-bit before proceeding further
5
- if ("${MACHINE_TYPE} " MATCHES "x86_64" )
6
- # Default to older SSE-instruction-based FFT library
7
- if (NOT (DEFINED ENV{TRAVIS} ))
1
+ # checking whether the machine is of type 64-bit before proceeding further
2
+ if ( ("${CMAKE_SYSTEM_PROCESSOR} " MATCHES "x86_64" ) AND ("${CMAKE_SYSTEM_NAME} " MATCHES "LINUX" ) )
3
+ # Default to older SSE-instruction-based FFT library
4
+ if (NOT (DEFINED ENV{TRAVIS} ))
8
5
if (LEGACY_ARCHITECTURE OR (NOT DEFINED (LEGACY_ARCHITECTURE )))
9
6
set (fft_library ${CMAKE_CURRENT_SOURCE_DIR} /libfft_sse.a )
10
7
else ()
@@ -17,7 +14,6 @@ if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
17
14
)
18
15
target_link_libraries (coarray_navier_stokes OpenCoarrays ${fft_library} )
19
16
endif ()
20
- endif ()
21
17
else ()
22
18
# Skip Navier-Stokes build until an appropriate FFT has been found.
23
19
endif ()
You can’t perform that action at this time.
0 commit comments