update features_with_dependency test

Author: perazz

example_packages/features_with_dependency/fpm.toml

@@ -8,32 +8,31 @@ name = "features_with_dependency"
 source-dir = "app"
 main = "main.f90"
 
-# Enable cpp preprocessing on the main program
-[preprocess.cpp]
-
 [dependencies]
 # Base dependencies (none for this demo - features will add them)
 
 [features]
 # Feature that enables debug mode in the dependency
 with_feat_debug.dependencies.features_demo = { path = "../features_demo", features = ["debug"] }
-with_feat_debug.preprocess.cpp.macros = "WITH_DEBUG_DEPENDENCY"
+with_feat_debug.preprocess.cpp.macros = ["WITH_DEMO","WITH_DEBUG_DEPENDENCY"]
 
 # Feature that enables release mode in the dependency  
 with_feat_release.dependencies.features_demo = { path = "../features_demo", features = ["release"] }
-with_feat_release.preprocess.cpp.macros = "WITH_RELEASE_DEPENDENCY"
+with_feat_release.preprocess.cpp.macros = ["WITH_DEMO","WITH_RELEASE_DEPENDENCY"]
 
 # Feature that enables multiple dependency features
 with_feat_multi.dependencies.features_demo = { path = "../features_demo", features = ["debug", "mpi"] }
-with_feat_multi.preprocess.cpp.macros = "WITH_MULTI_DEPENDENCY"
+with_feat_multi.preprocess.cpp.macros = ["WITH_DEMO","WITH_MULTI_DEPENDENCY"]
 
 # Feature for platform-specific dependency features
 linux_specific.linux.dependencies.features_demo = { path = "../features_demo", features = ["linux"] }
-linux_specific.preprocess.cpp.macros = "LINUX_FEATURES"
+linux_specific.preprocess.cpp.macros = ["WITH_DEMO","LINUX_FEATURES"]
 
 # Feature combining compiler and dependency features
 gfortran_optimized.gfortran.dependencies.features_demo = { path = "../features_demo", features = ["release", "gfortran"] }
 gfortran_optimized.gfortran.flags = "-O3 -march=native"
+gfortran_optimized.preprocess.cpp.macros = ["WITH_DEMO"]
+
 
 [profiles]
 debug_dep = ["with_feat_debug"]

example_packages/features_with_dependency/src/features_with_dependency.f90

@@ -1,12 +1,14 @@
 module features_with_dependency
-    use features_demo, only: show_features => show_features, get_build_info
+#ifdef WITH_DEMO
+    use features_demo, only: show_demo_features => show_features
+#endif    
     implicit none
     private
-    public :: show_features => show_local_features
+    public :: show_features
 
 contains
 
-    subroutine show_local_features()
+    subroutine show_features()
         print *, "Local package features:"
 
 #ifdef WITH_DEBUG_DEPENDENCY
@@ -31,9 +33,13 @@ subroutine show_local_features()
 #endif
 
         print *, ""
-        print *, "Dependency (features_demo) status:"
-        call show_features()  ! Call features_demo's show_features
+#ifdef WITH_DEMO        
+        print *, "Dependency (features_demo) status:"        
+        call show_demo_features()  ! Call features_demo's show_features
+#else
+        print *, "Dependency (features_demo) is not attached"
+#endif        
 
-    end subroutine show_local_features
+    end subroutine show_features
 
-end module features_with_dependency
+end module features_with_dependency