From dcf92f8e25e9ab64bdf369c060a0bddf4ac0a33d Mon Sep 17 00:00:00 2001 From: Nuno Nobre Date: Tue, 17 Dec 2024 18:43:24 +0000 Subject: [PATCH 1/2] Fix target_link_libraries calls w/ alias target --- GuidedTutorials/HeatEquation/Exec/CMakeLists.txt | 3 ++- GuidedTutorials/HeatEquation_Simple/CMakeLists.txt | 3 ++- GuidedTutorials/HelloWorld/CMakeLists.txt | 3 ++- GuidedTutorials/MultiFab/CMakeLists.txt | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/GuidedTutorials/HeatEquation/Exec/CMakeLists.txt b/GuidedTutorials/HeatEquation/Exec/CMakeLists.txt index 33706d03..74921ca2 100644 --- a/GuidedTutorials/HeatEquation/Exec/CMakeLists.txt +++ b/GuidedTutorials/HeatEquation/Exec/CMakeLists.txt @@ -71,7 +71,8 @@ else() # Add mpi find_package(MPI REQUIRED) - target_link_libraries(AMReX::amrex INTERFACE ${MPI_LIBRARIES}) + get_target_property(AMReX_ALIASED AMReX::amrex ALIASED_TARGET) + target_link_libraries(${AMReX_ALIASED} INTERFACE ${MPI_LIBRARIES}) endif() diff --git a/GuidedTutorials/HeatEquation_Simple/CMakeLists.txt b/GuidedTutorials/HeatEquation_Simple/CMakeLists.txt index 0aee75e7..e8dc1065 100644 --- a/GuidedTutorials/HeatEquation_Simple/CMakeLists.txt +++ b/GuidedTutorials/HeatEquation_Simple/CMakeLists.txt @@ -63,7 +63,8 @@ else() # Add mpi find_package(MPI REQUIRED) - target_link_libraries(AMReX::amrex INTERFACE ${MPI_LIBRARIES}) + get_target_property(AMReX_ALIASED AMReX::amrex ALIASED_TARGET) + target_link_libraries(${AMReX_ALIASED} INTERFACE ${MPI_LIBRARIES}) endif() diff --git a/GuidedTutorials/HelloWorld/CMakeLists.txt b/GuidedTutorials/HelloWorld/CMakeLists.txt index 3a4c8849..2a960b2e 100644 --- a/GuidedTutorials/HelloWorld/CMakeLists.txt +++ b/GuidedTutorials/HelloWorld/CMakeLists.txt @@ -67,7 +67,8 @@ else() # Add mpi find_package(MPI REQUIRED) - target_link_libraries(AMReX::amrex INTERFACE ${MPI_LIBRARIES}) + get_target_property(AMReX_ALIASED AMReX::amrex ALIASED_TARGET) + target_link_libraries(${AMReX_ALIASED} INTERFACE ${MPI_LIBRARIES}) endif() diff --git a/GuidedTutorials/MultiFab/CMakeLists.txt b/GuidedTutorials/MultiFab/CMakeLists.txt index b5b3cbf8..b485ea69 100644 --- a/GuidedTutorials/MultiFab/CMakeLists.txt +++ b/GuidedTutorials/MultiFab/CMakeLists.txt @@ -67,7 +67,8 @@ else() # Add mpi find_package(MPI REQUIRED) - target_link_libraries(AMReX::amrex INTERFACE ${MPI_LIBRARIES}) + get_target_property(AMReX_ALIASED AMReX::amrex ALIASED_TARGET) + target_link_libraries(${AMReX_ALIASED} INTERFACE ${MPI_LIBRARIES}) endif() From 78c2f38bbb016c773e8f0afc2e114a3fc6aa29b1 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Fri, 10 Jan 2025 09:24:06 -0800 Subject: [PATCH 2/2] CMake: Remove `find_package(MPI)` Transitive already in AMReX --- GuidedTutorials/HeatEquation/Exec/CMakeLists.txt | 5 ----- GuidedTutorials/HeatEquation_Simple/CMakeLists.txt | 5 ----- GuidedTutorials/HelloWorld/CMakeLists.txt | 5 ----- GuidedTutorials/MultiFab/CMakeLists.txt | 5 ----- 4 files changed, 20 deletions(-) diff --git a/GuidedTutorials/HeatEquation/Exec/CMakeLists.txt b/GuidedTutorials/HeatEquation/Exec/CMakeLists.txt index 74921ca2..9c01f082 100644 --- a/GuidedTutorials/HeatEquation/Exec/CMakeLists.txt +++ b/GuidedTutorials/HeatEquation/Exec/CMakeLists.txt @@ -69,11 +69,6 @@ else() message("-- Searching for AMReX install directory at ${AMReX_ROOT}") find_package(AMReX REQUIRED PATHS ${AMReX_ROOT}/lib/cmake/AMReX/AMReXConfig.cmake) - # Add mpi - find_package(MPI REQUIRED) - get_target_property(AMReX_ALIASED AMReX::amrex ALIASED_TARGET) - target_link_libraries(${AMReX_ALIASED} INTERFACE ${MPI_LIBRARIES}) - endif() target_link_libraries(HeatEquation PRIVATE AMReX::amrex) diff --git a/GuidedTutorials/HeatEquation_Simple/CMakeLists.txt b/GuidedTutorials/HeatEquation_Simple/CMakeLists.txt index e8dc1065..6fb5fbbf 100644 --- a/GuidedTutorials/HeatEquation_Simple/CMakeLists.txt +++ b/GuidedTutorials/HeatEquation_Simple/CMakeLists.txt @@ -61,11 +61,6 @@ else() message("-- Searching for AMReX install directory at ${AMReX_ROOT}") find_package(AMReX PATHS ${AMReX_ROOT}/lib/cmake/AMReX/AMReXConfig.cmake) - # Add mpi - find_package(MPI REQUIRED) - get_target_property(AMReX_ALIASED AMReX::amrex ALIASED_TARGET) - target_link_libraries(${AMReX_ALIASED} INTERFACE ${MPI_LIBRARIES}) - endif() target_link_libraries(HeatEquation_Simple PRIVATE AMReX::amrex) diff --git a/GuidedTutorials/HelloWorld/CMakeLists.txt b/GuidedTutorials/HelloWorld/CMakeLists.txt index 2a960b2e..38d3b13c 100644 --- a/GuidedTutorials/HelloWorld/CMakeLists.txt +++ b/GuidedTutorials/HelloWorld/CMakeLists.txt @@ -65,11 +65,6 @@ else() message("-- Searching for AMReX install directory at ${AMReX_ROOT}") find_package(AMReX PATHS ${AMReX_ROOT}/lib/cmake/AMReX/AMReXConfig.cmake) - # Add mpi - find_package(MPI REQUIRED) - get_target_property(AMReX_ALIASED AMReX::amrex ALIASED_TARGET) - target_link_libraries(${AMReX_ALIASED} INTERFACE ${MPI_LIBRARIES}) - endif() target_link_libraries(HelloWorld PRIVATE AMReX::amrex) diff --git a/GuidedTutorials/MultiFab/CMakeLists.txt b/GuidedTutorials/MultiFab/CMakeLists.txt index b485ea69..140ddcdc 100644 --- a/GuidedTutorials/MultiFab/CMakeLists.txt +++ b/GuidedTutorials/MultiFab/CMakeLists.txt @@ -65,11 +65,6 @@ else() message("-- Searching for AMReX install directory at ${AMReX_ROOT}") find_package(AMReX PATHS ${AMReX_ROOT}/lib/cmake/AMReX/AMReXConfig.cmake) - # Add mpi - find_package(MPI REQUIRED) - get_target_property(AMReX_ALIASED AMReX::amrex ALIASED_TARGET) - target_link_libraries(${AMReX_ALIASED} INTERFACE ${MPI_LIBRARIES}) - endif() target_link_libraries(MultiFab PRIVATE AMReX::amrex)