Make compile definitions public

polyfem · Jan 17, 2024 · 811c9a7 · 811c9a7
1 parent 9ca0ffc
commit 811c9a7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -169,7 +169,7 @@ target_include_directories(polysolve PUBLIC ${PROJECT_SOURCE_DIR}/src)
 ################################################################################
 
 if(POLYSOLVE_LARGE_INDEX)
-    target_compile_definitions(polysolve_linear PUBLIC -DPOLYSOLVE_LARGE_INDEX)
+    target_compile_definitions(polysolve_linear PUBLIC POLYSOLVE_LARGE_INDEX)
 endif()
 
 target_compile_definitions(polysolve_linear PRIVATE POLYSOLVE_LINEAR_SPEC="${PROJECT_SOURCE_DIR}/linear-solver-spec.json")
@@ -198,7 +198,7 @@ if(POLYSOLVE_WITH_ACCELERATE)
     find_package(BLAS REQUIRED)
     find_package(LAPACK REQUIRED)
     target_link_libraries(polysolve_linear PRIVATE BLAS::BLAS LAPACK::LAPACK)
-    target_compile_definitions(polysolve_linear PRIVATE -DPOLYSOLVE_WITH_ACCELERATE)
+    target_compile_definitions(polysolve_linear PUBLIC POLYSOLVE_WITH_ACCELERATE)
 endif()
 
 include(eigen)
@@ -220,7 +220,7 @@ target_link_libraries(polysolve_linear PUBLIC jse::jse)
 if(POLYSOLVE_WITH_HYPRE)
     include(hypre)
     target_link_libraries(polysolve_linear PUBLIC HYPRE::HYPRE)
-    target_compile_definitions(polysolve_linear PRIVATE -DPOLYSOLVE_WITH_HYPRE)
+    target_compile_definitions(polysolve_linear PUBLIC POLYSOLVE_WITH_HYPRE)
     if(HYPRE_WITH_MPI)
         target_compile_definitions(polysolve_linear PUBLIC HYPRE_WITH_MPI)
     endif()
@@ -230,22 +230,22 @@ endif()
 if(POLYSOLVE_WITH_CHOLMOD)
     include(suitesparse)
     target_link_libraries(polysolve_linear PRIVATE SuiteSparse::CHOLMOD)
-    target_compile_definitions(polysolve_linear PRIVATE -DPOLYSOLVE_WITH_CHOLMOD)
+    target_compile_definitions(polysolve_linear PUBLIC POLYSOLVE_WITH_CHOLMOD)
 endif()
 
 # MKL library
 if(POLYSOLVE_WITH_MKL)
     include(mkl)
     target_link_libraries(polysolve_linear PRIVATE mkl::mkl)
-    target_compile_definitions(polysolve_linear PRIVATE -DPOLYSOLVE_WITH_MKL)
+    target_compile_definitions(polysolve_linear PUBLIC POLYSOLVE_WITH_MKL)
 endif()
 
 # Pardiso solver
 if(POLYSOLVE_WITH_PARDISO)
     include(pardiso)
     if(TARGET Pardiso::Pardiso)
         target_link_libraries(polysolve_linear PRIVATE Pardiso::Pardiso)
-        target_compile_definitions(polysolve_linear PRIVATE -DPOLYSOLVE_WITH_PARDISO)
+        target_compile_definitions(polysolve_linear PUBLIC POLYSOLVE_WITH_PARDISO)
     else()
         message(WARNING "Pardiso not found, solver will not be available.")
     endif()
@@ -255,15 +255,15 @@ endif()
 if(POLYSOLVE_WITH_UMFPACK)
     include(suitesparse)
     target_link_libraries(polysolve_linear PRIVATE SuiteSparse::UMFPACK)
-    target_compile_definitions(polysolve_linear PRIVATE -DPOLYSOLVE_WITH_UMFPACK)
+    target_compile_definitions(polysolve_linear PUBLIC POLYSOLVE_WITH_UMFPACK)
 endif()
 
 # SuperLU solver
 if(POLYSOLVE_WITH_SUPERLU)
     include(superlu)
     if(TARGET SuperLU::SuperLU)
         target_link_libraries(polysolve_linear PRIVATE SuperLU::SuperLU)
-        target_compile_definitions(polysolve_linear PRIVATE -DPOLYSOLVE_WITH_SUPERLU)
+        target_compile_definitions(polysolve_linear PUBLIC POLYSOLVE_WITH_SUPERLU)
     else()
         message(WARNING "SuperLU not found, solver will not be available.")
     endif()
@@ -273,22 +273,22 @@ endif()
 if(POLYSOLVE_WITH_AMGCL)
     include(amgcl)
     target_link_libraries(polysolve_linear PUBLIC amgcl::amgcl)
-    target_compile_definitions(polysolve_linear PRIVATE -DPOLYSOLVE_WITH_AMGCL)
+    target_compile_definitions(polysolve_linear PUBLIC POLYSOLVE_WITH_AMGCL)
 endif()
 
 # Spectra (MPL 2.0)
 if(POLYSOLVE_WITH_SPECTRA)
     include(spectra)
     target_link_libraries(polysolve_linear PUBLIC Spectra::Spectra)
-    target_compile_definitions(polysolve_linear PRIVATE -DPOLYSOLVE_WITH_SPECTRA)
+    target_compile_definitions(polysolve_linear PUBLIC POLYSOLVE_WITH_SPECTRA)
 endif()
 
 # cuSolver solvers
 if(POLYSOLVE_WITH_CUSOLVER)
     include(cusolverdn)
     if(TARGET CUDA::cusolver)
         target_link_libraries(polysolve_linear PUBLIC CUDA::cusolver)
-        target_compile_definitions(polysolve_linear PRIVATE -DPOLYSOLVE_WITH_CUSOLVER)
+        target_compile_definitions(polysolve_linear PUBLIC POLYSOLVE_WITH_CUSOLVER)
     else()
         message(WARNING "cuSOLVER not found, solver will not be available.")
     endif()

diff --git a/src/polysolve/linear/Solver.cpp b/src/polysolve/linear/Solver.cpp
@@ -83,7 +83,7 @@ namespace polysolve::linear
                 }
             }
             if (!accepted_solver.empty())
-                logger.info("Solver {} is the highest priority availble solver; using it.", accepted_solver);
+                logger.info("Solver {} is the highest priority available solver; using it.", accepted_solver);
             else
                 logger.warn("No valid solver found in the list of specified solvers!");
             params[lin_solver_ptr] = accepted_solver;