Skip to content
Snippets Groups Projects
Commit 36e5bb02 authored by Stéphane Del Pino's avatar Stéphane Del Pino
Browse files

Merge branch 'feature/kokkos-inline-handling' into 'develop'

Change Kokkos namespace to InlineKokkos at compile time

See merge request !134
parents 3d59b3ad 5a7b6ca4
No related branches found
No related tags found
1 merge request!134Change Kokkos namespace to InlineKokkos at compile time
......@@ -86,6 +86,11 @@ endif()
set(GNU_CXX_MIN_VERSION "9.0.0")
set(CLANG_CXX_MIN_VERSION "10.0.0")
#------------------------------------------------------
# Change Kokkos namespace to avoid conflicts
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DKokkos=InlineKokkos")
#------------------------------------------------------
# Pugs default compiler flags
set(PUGS_CXX_FLAGS "${PUGS_CXX_FLAGS} -Wall -Wextra -pedantic")
......@@ -576,7 +581,7 @@ target_link_libraries(
PugsUtils
PugsOutput
PugsLanguageUtils
kokkos
Kokkos::kokkos
${PETSC_LIBRARIES}
${SLEPC_LIBRARIES}
${PARMETIS_LIBRARIES}
......
......@@ -196,7 +196,7 @@ target_link_libraries (unit_tests
PugsScheme
PugsOutput
PugsUtils
kokkos
Kokkos::kokkos
${PARMETIS_LIBRARIES}
${MPI_CXX_LINK_FLAGS} ${MPI_CXX_LIBRARIES}
${PETSC_LIBRARIES}
......@@ -223,7 +223,7 @@ target_link_libraries (mpi_unit_tests
PugsUtils
PugsAlgebra
PugsMesh
kokkos
Kokkos::kokkos
${PARMETIS_LIBRARIES}
${MPI_CXX_LINK_FLAGS} ${MPI_CXX_LIBRARIES}
${PETSC_LIBRARIES}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment