Merge pull request #264 from ecmwf-ifs/naan-more-cmake-fixes

[CMake] Expose GLOBAL_VAR_OFFLOAD and INCLUDES in loki_transform_target
ecmwf-ifs · Apr 8, 2024 · 09d0bd2 · 09d0bd2
2 parents 0a15267 + 5429ad5
commit 09d0bd2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/cmake/loki_transform.cmake b/cmake/loki_transform.cmake
@@ -225,10 +225,10 @@ function( loki_transform_target )
 
     set( options
          NO_PLAN_SOURCEDIR COPY_UNMODIFIED CPP CPP_PLAN INLINE_MEMBERS
-	 RESOLVE_SEQUENCE_ASSOCIATION DERIVE_ARGUMENT_ARRAY_SHAPE TRIM_VECTOR_SECTIONS
+	 RESOLVE_SEQUENCE_ASSOCIATION DERIVE_ARGUMENT_ARRAY_SHAPE TRIM_VECTOR_SECTIONS GLOBAL_VAR_OFFLOAD
     )
     set( single_value_args TARGET COMMAND MODE DIRECTIVE FRONTEND CONFIG PLAN )
-    set( multi_value_args SOURCES HEADERS DEFINITIONS )
+    set( multi_value_args SOURCES HEADERS DEFINITIONS INCLUDES )
 
     cmake_parse_arguments( _PAR_T "${options}" "${single_value_args}" "${multi_value_args}" ${ARGN} )
 
@@ -307,6 +307,10 @@ function( loki_transform_target )
             list( APPEND _TRANSFORM_OPTIONS TRIM_VECTOR_SECTIONS )
         endif()
 
+        if( _PAR_T_GLOBAL_VAR_OFFLOAD )
+            list( APPEND _TRANSFORM_OPTIONS GLOBAL_VAR_OFFLOAD )
+        endif()
+
         loki_transform(
             COMMAND     ${_PAR_T_COMMAND}
             OUTPUT      ${LOKI_SOURCES_TO_APPEND}
@@ -318,6 +322,7 @@ function( loki_transform_target )
             SOURCES     ${_PAR_T_SOURCES}
             HEADERS     ${_PAR_T_HEADERS}
             DEFINITIONS ${_PAR_T_DEFINITIONS}
+            INCLUDES    ${_PAR_T_INCLUDES}
             DEPENDS     ${LOKI_SOURCES_TO_TRANSFORM} ${_PAR_T_HEADER} ${_PAR_T_CONFIG}
             ${_TRANSFORM_OPTIONS}
         )

diff --git a/scripts/loki_transform.py b/scripts/loki_transform.py
@@ -319,7 +319,7 @@ def transform_subroutine(self, routine, **kwargs):
 
 @cli.command('plan')
 @click.option('--mode', '-m', default='sca',
-              type=click.Choice(['idem', 'sca', 'claw', 'scc', 'scc-hoist', 'scc-stack']))
+              type=click.Choice(['idem', 'idem-stack', 'sca', 'claw', 'scc', 'scc-hoist', 'scc-stack']))
 @click.option('--config', '-c', type=click.Path(),
               help='Path to configuration file.')
 @click.option('--header', '-I', type=click.Path(), multiple=True,