From 77817543555a954187fba011e77df832a07220a0 Mon Sep 17 00:00:00 2001
From: Benjamin Ransom Ryan <brryan@lanl.gov>
Date: Wed, 25 Sep 2024 12:53:26 -0600
Subject: [PATCH] Latest submodule versions

---
 CMakeLists.txt         |  4 ++--
 cmake/SetupDeps.cmake  | 14 +++++++-------
 cmake/SetupFlags.cmake | 11 ++++++++---
 utils/kokkos           |  2 +-
 utils/ports-of-call    |  2 +-
 utils/spiner           |  2 +-
 utils/variant          |  2 +-
 7 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e34cb89..cfdfc9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,10 +53,10 @@ target_include_directories(singularity-opac::flags
                            INTERFACE
                            $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>)
 
-include (SetupDeps)
 include (SetupOptions)
-include (SetupCompilers)
 include (SetupFlags)
+include (SetupDeps)
+include (SetupCompilers)
 
 if (SINGULARITY_USE_HDF5)
   message(STATUS "HDF5 enabled. Requesting it in spiner")
diff --git a/cmake/SetupDeps.cmake b/cmake/SetupDeps.cmake
index be2f30e..048d700 100644
--- a/cmake/SetupDeps.cmake
+++ b/cmake/SetupDeps.cmake
@@ -14,6 +14,8 @@ endif()
 # Setup ports of call
 # - provides PortsofCall::PortsofCall
 #=======================================
+get_target_property(defs ${PROJECT_NAME} INTERFACE_COMPILE_DEFINITIONS)
+message(STATUS "POC Compile Definitions for ${PROJECT_NAME}: ${defs}")
 find_package(PortsofCall REQUIRED)
 target_link_libraries(singularity-opac::flags INTERFACE PortsofCall::PortsofCall)
 
@@ -21,13 +23,11 @@ target_link_libraries(singularity-opac::flags INTERFACE PortsofCall::PortsofCall
 # Setup Kokkos
 # - provides Kokkos::kokkos
 #=======================================
-if (SINGULARITY_USE_KOKKOS)
-  if (NOT TARGET Kokkos::kokkos)
-    add_subdirectory(utils/kokkos)
-    find_package(Kokkos QUIET)
-  else()
-    message(status "Kokkos::kokkos provided by parent package")
-  endif()
+if (NOT TARGET Kokkos::kokkos)
+  add_subdirectory(utils/kokkos)
+  find_package(Kokkos QUIET)
+else()
+  message(status "Kokkos::kokkos provided by parent package")
 endif()
 
 #=======================================
diff --git a/cmake/SetupFlags.cmake b/cmake/SetupFlags.cmake
index d0f6896..b491f8e 100644
--- a/cmake/SetupFlags.cmake
+++ b/cmake/SetupFlags.cmake
@@ -63,17 +63,22 @@ INTERFACE
     > # with_kokkos
 )
 
+get_target_property(defs ${PROJECT_NAME} INTERFACE_COMPILE_DEFINITIONS)
+message(STATUS "BEFORE compile Definitions for ${PROJECT_NAME}: ${defs}")
 target_compile_definitions(${PROJECT_NAME}
 INTERFACE
-  $<${with_kokkos}:
-    PORTABILITY_STRATEGY_KOKKOS
-  >
+  #$<${with_kokkos}:
+  #  PORTABILITY_STRATEGY_KOKKOS
+  #>
   $<${without_kokkos}:
     $<${with_fmath}:
       SINGULARITY_USE_FMATH
     >
+    PORTABILITY_STRATEGY_NONE
   >
 )
+get_target_property(defs ${PROJECT_NAME} INTERFACE_COMPILE_DEFINITIONS)
+message(STATUS "Compile Definitions for ${PROJECT_NAME}: ${defs}")
 
 # target_link_libraries brings in compile flags, compile defs, link flags.
 target_link_libraries(${PROJECT_NAME}
diff --git a/utils/kokkos b/utils/kokkos
index 1fb0c28..08ceff9 160000
--- a/utils/kokkos
+++ b/utils/kokkos
@@ -1 +1 @@
-Subproject commit 1fb0c284d458c75370094921d9f202c287502325
+Subproject commit 08ceff92bcf3a828844480bc1e6137eb74028517
diff --git a/utils/ports-of-call b/utils/ports-of-call
index 993d820..58ce118 160000
--- a/utils/ports-of-call
+++ b/utils/ports-of-call
@@ -1 +1 @@
-Subproject commit 993d8209de98da186c5e0b445a4d6c359afa8c81
+Subproject commit 58ce1181b2d835bd32673ad70550c9130381f91b
diff --git a/utils/spiner b/utils/spiner
index 33862f8..bd57161 160000
--- a/utils/spiner
+++ b/utils/spiner
@@ -1 +1 @@
-Subproject commit 33862f831be65e2dd2284b42f05c477b6fe7367a
+Subproject commit bd57161576a62a13341dada183f2b336a3e99b08
diff --git a/utils/variant b/utils/variant
index 3c7fc82..23cb94f 160000
--- a/utils/variant
+++ b/utils/variant
@@ -1 +1 @@
-Subproject commit 3c7fc8266bb46046b42c2dc2663f9f505f0cec28
+Subproject commit 23cb94f027d4ef33bf48133acc2695c7e5c6f1e7