diff options
| -rw-r--r-- | .github/workflows/ubuntu.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Regression/WarpX-GPU-tests.ini | 1 | ||||
| -rw-r--r-- | Regression/WarpX-tests.ini | 1 | ||||
| -rw-r--r-- | cmake/WarpXFunctions.cmake | 2 | ||||
| -rw-r--r-- | cmake/dependencies/AMReX.cmake | 5 |
6 files changed, 6 insertions, 11 deletions
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 7ea878edd..c196d4de5 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -61,7 +61,7 @@ jobs: sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list sudo apt-get update - sudo apt-get install -y intel-oneapi-dpcpp-compiler intel-oneapi-mkl gfortran + sudo apt-get install -y intel-oneapi-dpcpp-compiler intel-oneapi-mkl set +e source /opt/intel/inteloneapi/setvars.sh set -e diff --git a/CMakeLists.txt b/CMakeLists.txt index 1af7cdc67..01636b6e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,7 +76,7 @@ include(CTest) # builds AMReX from source (default) or finds an existing install include(${WarpX_SOURCE_DIR}/cmake/dependencies/AMReX.cmake) # suppress warnings in AMReX headers (use -isystem instead of -I) -#make_third_party_includes_system(AMReX::amrex AMReX) +make_third_party_includes_system(AMReX::amrex AMReX) # PICSAR # builds PICSAR from source @@ -149,9 +149,7 @@ set_target_properties(WarpX PROPERTIES ) # link dependencies -# FIXME use AMReX::thirdparty::AMReX as soon as -# missing _deps/fetchedamrex-build/mod_files is solved -target_link_libraries(WarpX PUBLIC AMReX::amrex) +target_link_libraries(WarpX PUBLIC WarpX::thirdparty::AMReX) if(WarpX_ASCENT) # work-around until ascent's CMake Config scripts are properly placed diff --git a/Regression/WarpX-GPU-tests.ini b/Regression/WarpX-GPU-tests.ini index ca49e9ade..b2fc21831 100644 --- a/Regression/WarpX-GPU-tests.ini +++ b/Regression/WarpX-GPU-tests.ini @@ -12,7 +12,6 @@ sourceTree = C_Src suiteName = WarpX-GPU COMP = g++ -FCOMP = gfortran add_to_c_make_command = TEST=TRUE USE_ASSERTION=TRUE WarpxBinDir= purge_output = 1 diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index a2ea67bd9..9df25e1da 100644 --- a/Regression/WarpX-tests.ini +++ b/Regression/WarpX-tests.ini @@ -12,7 +12,6 @@ sourceTree = C_Src suiteName = WarpX COMP = g++ -FCOMP = gfortran add_to_c_make_command = TEST=TRUE USE_ASSERTION=TRUE WarpxBinDir= purge_output = 1 diff --git a/cmake/WarpXFunctions.cmake b/cmake/WarpXFunctions.cmake index f12f4aa3c..49eb5a6ce 100644 --- a/cmake/WarpXFunctions.cmake +++ b/cmake/WarpXFunctions.cmake @@ -104,7 +104,7 @@ endmacro() # function(make_third_party_includes_system imported_target propagated_name) add_library(WarpX::thirdparty::${propagated_name} INTERFACE IMPORTED) - target_link_libraries(WarpX::thirdparty::${propagated_name} INTERFACE AMReX::amrex) + target_link_libraries(WarpX::thirdparty::${propagated_name} INTERFACE ${imported_target}) get_target_property(ALL_INCLUDES ${imported_target} INCLUDE_DIRECTORIES) set_target_properties(WarpX::thirdparty::${propagated_name} PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "") target_include_directories(WarpX::thirdparty::${propagated_name} SYSTEM INTERFACE ${ALL_INCLUDES}) diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index 5458e39ea..8633b7653 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -34,9 +34,8 @@ macro(find_amrex) set(ENABLE_DP_PARTICLES OFF CACHE INTERNAL "") endif() - enable_language(Fortran) - set(ENABLE_FORTRAN ON CACHE INTERNAL "") - set(ENABLE_FORTRAN_INTERFACES ON CACHE INTERNAL "") + set(ENABLE_FORTRAN OFF CACHE INTERNAL "") + set(ENABLE_FORTRAN_INTERFACES OFF CACHE INTERNAL "") set(ENABLE_TUTORIALS OFF CACHE INTERNAL "") set(ENABLE_PARTICLES ON CACHE INTERNAL "") set(ENABLE_TINY_PROFILE ON CACHE INTERNAL "") |