Fix trilinos.cmake

polyfem · Mar 19, 2024 · e9416ab · e9416ab
1 parent f66222a
commit e9416ab
Showing 1 changed file with 24 additions and 18 deletions.
diff --git a/cmake/recipes/trilinos.cmake b/cmake/recipes/trilinos.cmake
@@ -7,31 +7,37 @@ message(STATUS "Third-party: creating target 'Trilinos::Trilinos'")
 find_package(Trilinos COMPONENTS ML Epetra)
 
 if(NOT Trilinos_FOUND)
+    set(POLYSOLVE_WITH_TRILINOS OFF)
     message("Trilinos not found.")
 endif()
 
 find_package(MPI)
 
 if(NOT MPI_FOUND)
+    set(POLYSOLVE_WITH_TRILINOS OFF)
     message("MPI not found.")
 endif()
 
-MESSAGE("\nFound Trilinos!  Here are the details: ")
-MESSAGE("   Trilinos_DIR = ${Trilinos_DIR}")
-MESSAGE("   Trilinos_VERSION = ${Trilinos_VERSION}")
-MESSAGE("   Trilinos_PACKAGE_LIST = ${Trilinos_PACKAGE_LIST}")
-MESSAGE("   Trilinos_LIBRARIES = ${Trilinos_LIBRARIES} ")
-MESSAGE("   Trilinos_INCLUDE_DIRS = ${Trilinos_INCLUDE_DIRS} ")
-MESSAGE("   Trilinos_TPL_LIST = ${Trilinos_TPL_LIST}")
-MESSAGE("   Trilinos_TPL_LIBRARIES = ${Trilinos_TPL_LIBRARIES}")
-MESSAGE("   Trilinos_BUILD_SHARED_LIBS = ${Trilinos_BUILD_SHARED_LIBS}")
-MESSAGE("End of Trilinos details\n")
-# include(trilinos)  
-if(TARGET Trilinos::Trilinos)
-else()
-    add_library(trilinos INTERFACE)
-    add_library(Trilinos::Trilinos ALIAS trilinos)
-    target_include_directories(trilinos INTERFACE ${Trilinos_INCLUDE_DIRS} )
-    target_link_libraries(trilinos INTERFACE ${Trilinos_LIBRARIES} )
-    target_link_libraries(trilinos INTERFACE MPI::MPI_C MPI::MPI_CXX )
+if(Trilinos_FOUND)
+    if(MPI_FOUND)
+        MESSAGE("\nFound Trilinos!  Here are the details: ")
+        MESSAGE("   Trilinos_DIR = ${Trilinos_DIR}")
+        MESSAGE("   Trilinos_VERSION = ${Trilinos_VERSION}")
+        MESSAGE("   Trilinos_PACKAGE_LIST = ${Trilinos_PACKAGE_LIST}")
+        MESSAGE("   Trilinos_LIBRARIES = ${Trilinos_LIBRARIES} ")
+        MESSAGE("   Trilinos_INCLUDE_DIRS = ${Trilinos_INCLUDE_DIRS} ")
+        MESSAGE("   Trilinos_TPL_LIST = ${Trilinos_TPL_LIST}")
+        MESSAGE("   Trilinos_TPL_LIBRARIES = ${Trilinos_TPL_LIBRARIES}")
+        MESSAGE("   Trilinos_BUILD_SHARED_LIBS = ${Trilinos_BUILD_SHARED_LIBS}")
+        MESSAGE("End of Trilinos details\n")
+        # include(trilinos)
+        if(TARGET Trilinos::Trilinos)
+        else()
+            add_library(trilinos INTERFACE)
+            add_library(Trilinos::Trilinos ALIAS trilinos)
+            target_include_directories(trilinos INTERFACE ${Trilinos_INCLUDE_DIRS} )
+            target_link_libraries(trilinos INTERFACE ${Trilinos_LIBRARIES} )
+            target_link_libraries(trilinos INTERFACE MPI::MPI_C MPI::MPI_CXX )
+        endif()
+    endif()
 endif()