feat: ability to read macros from manifest (#720)

Co-authored-by: zoziha <zuo.zhihua@qq.com>

Author: arteevraina

ci/run_tests.sh

@@ -118,5 +118,13 @@ pushd c_main
 "$fpm" run
 popd
 
+pushd preprocess_cpp
+"$fpm" build
+popd
+
+pushd preprocess_hello
+"$fpm" build
+popd
+
 # Cleanup
 rm -rf ./*/build

example_packages/preprocess_cpp/fpm.toml

@@ -1,4 +1,7 @@
 name = "preprocess_cpp"
 
+version = "1"
+
 [preprocess]
 [preprocess.cpp]
+macros = ["TESTMACRO", "TESTMACRO2=3", "TESTMACRO3={version}"]

example_packages/preprocess_cpp/src/preprocess_cpp.f90

@@ -9,5 +9,14 @@ subroutine say_hello
 #ifndef TESTMACRO
       This breaks the build.
 #endif
+
+#if TESTMACRO2 != 3
+      This breaks the build.
+#endif
+
+#if TESTMACRO3 != 1
+      This breaks the build.
+#endif
+
    end subroutine say_hello
 end module preprocess_cpp

example_packages/preprocess_hello/README.md

@@ -0,0 +1,2 @@
+# preprocess_hello
+My cool new project!

example_packages/preprocess_hello/app/main.f90

@@ -0,0 +1,6 @@
+program preprocess_hello
+    use preprocess_hello_dependency, only: say_hello
+
+    implicit none
+    call say_hello()
+end program preprocess_hello

example_packages/preprocess_hello/fpm.toml

@@ -0,0 +1,8 @@
+name = "preprocess_hello"
+
+[preprocess]
+[preprocess.cpp]
+macros = ["FOO"]
+
+[dependencies]
+preprocess_hello_dependency = { path = "../preprocess_hello_dependency" }

example_packages/preprocess_hello_dependency/README.md

@@ -0,0 +1,2 @@
+# preprocess_hello_dependency
+My cool new project!

example_packages/preprocess_hello_dependency/fpm.toml

@@ -0,0 +1 @@
+name = "preprocess_hello_dependency"

example_packages/preprocess_hello_dependency/src/preprocess_hello_dependency.f90

@@ -0,0 +1,15 @@
+module preprocess_hello_dependency
+  implicit none
+  private
+
+  public :: say_hello
+contains
+  subroutine say_hello
+
+!> If this build fails, then it implies that macros are getting passed to the dependency.
+#ifdef FOO
+    This breaks the build inside dependency. This implies that macros are getting passed to the dependeny.
+#endif
+    print *, "Hello, preprocess_hello_dependency!"
+  end subroutine say_hello
+end module preprocess_hello_dependency

src/fpm.f90

@@ -44,6 +44,7 @@ subroutine build_model(model, settings, package, error)
     integer :: i, j
     type(package_config_t) :: dependency
     character(len=:), allocatable :: manifest, lib_dir, flags, cflags, ldflags
+    character(len=:), allocatable :: version
 
     logical :: duplicates_found = .false.
     type(string_t) :: include_dir
@@ -78,7 +79,7 @@ subroutine build_model(model, settings, package, error)
         end select
     end if
 
-    call set_preprocessor_flags(model%compiler%id, flags)
+    call set_preprocessor_flags(model%compiler%id, flags, package)
 
     cflags = trim(settings%cflag)
     ldflags = trim(settings%ldflag)
@@ -166,6 +167,17 @@ subroutine build_model(model, settings, package, error)
             if (allocated(error)) exit
 
             model%packages(i)%name = dependency%name
+            call package%version%to_string(version)
+            model%packages(i)%version = version
+            
+            if (allocated(dependency%preprocess)) then
+                do j = 1, size(dependency%preprocess)
+                    if (package%preprocess(j)%name == "cpp") then
+                        model%packages(i)%macros = dependency%preprocess(j)%macros
+                    end if
+                end do
+            end if
+
             if (.not.allocated(model%packages(i)%sources)) allocate(model%packages(i)%sources(0))
 
             if (allocated(dependency%library)) then