From 58123417876f8f5b0d8a2b3f6f3843272dab2991 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <t.applencourt@gmail.com>
Date: Wed, 3 Jun 2015 10:51:32 +0200
Subject: [PATCH] Add ninja suport in gfortran config file

---
 config/gfortran_example.cfg               | 4 +++-
 config/ifort_example.cfg                  | 3 ++-
 scripts/compilation/create_ninja_build.py | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/gfortran_example.cfg b/config/gfortran_example.cfg
index 06497979..cc42b176 100644
--- a/config/gfortran_example.cfg
+++ b/config/gfortran_example.cfg
@@ -4,13 +4,15 @@
 # -ffree-line-length-none : Needed for IRPF90 which produces long lines
 # -lblas -llapack         : Link with libblas and liblapack libraries provided by the system
 #
+# --ninja                 : Allow the utilisation of ninja. It is mandatory!
 # --align=32              : Align all provided arrays on a 32-byte boundary
 #
+#
 [COMMON]
 FC           : gfortran -ffree-line-length-none 
 LAPACK_LIB   : -lblas -llapack
 IRPF90       : irpf90
-IRPF90_FLAGS : --align=32
+IRPF90_FLAGS : --ninja --align=32
 
 # Global options
 ################
diff --git a/config/ifort_example.cfg b/config/ifort_example.cfg
index 919ad4b7..e1a0dadf 100644
--- a/config/ifort_example.cfg
+++ b/config/ifort_example.cfg
@@ -2,13 +2,14 @@
 ##############
 #
 # -mkl=[parallel|sequential] : Use the MKL library
+# --ninja                 : Allow the utilisation of ninja. It is mandatory !
 # --align=32                 : Align all provided arrays on a 32-byte boundary
 #
 [COMMON]
 FC           : ifort
 LAPACK_LIB   : -mkl=parallel
 IRPF90       : irpf90
-IRPF90_FLAGS : --align=32 --ninja
+IRPF90_FLAGS : --ninja --align=32
 
 # Global options
 ################
diff --git a/scripts/compilation/create_ninja_build.py b/scripts/compilation/create_ninja_build.py
index 27fc3941..74a1eda2 100755
--- a/scripts/compilation/create_ninja_build.py
+++ b/scripts/compilation/create_ninja_build.py
@@ -224,7 +224,7 @@ def ninja_ezfio_rule():
               for flag in ["FC", "FCFLAGS", "IRPF90"]]
 
     l_cmd = ["cd {0}".format(QPACKAGE_ROOT_EZFIO)
-             ] + l_flag + ["{0}/ninja/ninja".format(QPACKAGE_ROOT)]
+             ] + l_flag + ["ninja"]
 
     l_string = ["rule build_ezfio",
                 "   command = {0}".format(" ; ".join(l_cmd)),