Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Samuel Martin <s.martin49@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 05/15] pkg-cmake.mk: export the fortran compiler path in the CMake toolchain file
Date: Fri,  1 Jul 2016 18:29:10 +0200	[thread overview]
Message-ID: <20160701162920.19632-6-s.martin49@gmail.com> (raw)
In-Reply-To: <20160701162920.19632-1-s.martin49@gmail.com>

Since the fortran support is conditional, only enable it when needed.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Cc: Benjamin Kamath <bkamath@spaceflight.com>

---
changes v1->v2:
- set CMAKE_Fortran_FLAGS in the toolchainfile.cmake (Benjamin K.)
---
 package/pkg-cmake.mk                | 3 +++
 support/misc/toolchainfile.cmake.in | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
index 81dcfcc..1fe2e51 100644
--- a/package/pkg-cmake.mk
+++ b/package/pkg-cmake.mk
@@ -243,9 +243,12 @@ $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:
 		-e 's#@@STAGING_SUBDIR@@#$(call qstrip,$(STAGING_SUBDIR))#' \
 		-e 's#@@TARGET_CFLAGS@@#$(call qstrip,$(TARGET_CFLAGS))#' \
 		-e 's#@@TARGET_CXXFLAGS@@#$(call qstrip,$(TARGET_CXXFLAGS))#' \
+		-e 's#@@TARGET_FCFLAGS@@#$(call qstrip,$(TARGET_FCFLAGS))#' \
 		-e 's#@@TARGET_LDFLAGS@@#$(call qstrip,$(TARGET_LDFLAGS))#' \
 		-e 's#@@TARGET_CC@@#$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_CC)))#' \
 		-e 's#@@TARGET_CXX@@#$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_CXX)))#' \
+		-e 's#@@TARGET_FC@@#$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_FC)))#' \
 		-e 's#@@CMAKE_SYSTEM_PROCESSOR@@#$(call qstrip,$(CMAKE_SYSTEM_PROCESSOR))#' \
+		-e 's#@@TOOLCHAIN_HAS_FORTRAN@@#$(if $(BR2_TOOLCHAIN_HAS_FORTRAN),1,0)#' \
 		$(TOPDIR)/support/misc/toolchainfile.cmake.in \
 		> $@
diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in
index 5cf381e..e550b8f 100644
--- a/support/misc/toolchainfile.cmake.in
+++ b/support/misc/toolchainfile.cmake.in
@@ -29,3 +29,7 @@ set(ENV{PKG_CONFIG_SYSROOT_DIR} "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@")
 # This toolchain file can be used both inside and outside Buildroot.
 set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@")
 set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@")
+if(@@TOOLCHAIN_HAS_FORTRAN@@)
+  set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@ ${CMAKE_Fortran_FLAGS}" CACHE STRING "Buildroot FCFLAGS")
+  set(CMAKE_Fortran_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_FC@@")
+endif()
-- 
2.9.0

  parent reply	other threads:[~2016-07-01 16:29 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-01 16:29 [Buildroot] [PATCH v2 00/15] Fortran support for all toolchain Samuel Martin
2016-07-01 16:29 ` [Buildroot] [PATCH v2 01/15] package/gcc: fix fortran support Samuel Martin
2016-07-01 18:19   ` Thomas Petazzoni
2016-07-01 16:29 ` [Buildroot] [PATCH v2 02/15] package/gcc: wrap gfortran Samuel Martin
2016-07-01 20:55   ` Thomas Petazzoni
2016-07-01 16:29 ` [Buildroot] [PATCH v2 03/15] package/Makefile.in: set TARGET_FCFLAGS variables Samuel Martin
2016-07-01 20:59   ` Thomas Petazzoni
2016-07-02 11:14     ` Arnout Vandecappelle
2016-07-01 16:29 ` [Buildroot] [PATCH v2 04/15] package/Makefile.in: set variables for legacy f77 checks Samuel Martin
2016-07-01 21:01   ` Thomas Petazzoni
2016-07-01 16:29 ` Samuel Martin [this message]
2016-07-01 21:02   ` [Buildroot] [PATCH v2 05/15] pkg-cmake.mk: export the fortran compiler path in the CMake toolchain file Thomas Petazzoni
2016-07-01 21:37     ` Samuel Martin
2016-07-01 16:29 ` [Buildroot] [PATCH v2 06/15] toolchain: add hidden symbol for fortran support in the toolchain Samuel Martin
2016-07-01 21:03   ` Thomas Petazzoni
2016-07-01 16:29 ` [Buildroot] [PATCH v2 07/15] package/gcc: select BR2_TOOLCHAIN_HAS_FORTRAN when appropriated Samuel Martin
2016-07-01 21:03   ` Thomas Petazzoni
2016-07-01 21:03   ` Thomas Petazzoni
2016-07-01 16:29 ` [Buildroot] [PATCH v2 08/15] package/gcc: used BR2_TOOLCHAIN_HAS_FORTRAN instead of BR2_TOOLCHAIN_BUILDROOT_FORTRAN Samuel Martin
2016-07-01 21:06   ` Thomas Petazzoni
2016-07-02 11:18     ` Arnout Vandecappelle
2016-07-01 16:29 ` [Buildroot] [PATCH v2 09/15] toolchain/helpers: add fortran check Samuel Martin
2016-07-01 21:19   ` Thomas Petazzoni
2016-07-01 16:29 ` [Buildroot] [PATCH v2 10/15] toolchain/toolchain-external: enable fortran check when it is selected Samuel Martin
2016-07-01 21:20   ` Thomas Petazzoni
2016-07-02  8:36     ` Samuel Martin
2016-07-01 16:29 ` [Buildroot] [PATCH v2 11/15] toolchain/toolchain-external: add libgfortran and libquadmath to the TOOLCHAIN_EXTERNAL_LIBS list Samuel Martin
2016-07-01 21:22   ` Thomas Petazzoni
2016-07-02 11:22     ` Arnout Vandecappelle
2016-07-01 16:29 ` [Buildroot] [PATCH v2 12/15] toolchain/toolchain-external: add knob for fortran support Samuel Martin
2016-07-01 21:23   ` Thomas Petazzoni
2016-07-02 10:37     ` Samuel Martin
2016-07-01 16:29 ` [Buildroot] [PATCH v2 13/15] toolchain/toolchain-external: update external toolchain configuration with BR2_TOOLCHAIN_HAS_FORTRAN Samuel Martin
2016-07-01 16:29 ` [Buildroot] [PATCH v2 14/15] package/fftw: add fortran support Samuel Martin
2016-07-01 16:29 ` [Buildroot] [PATCH v2 15/15] package/lapack: new package Samuel Martin
2016-07-01 21:26   ` Thomas Petazzoni
2016-07-02  9:45     ` Samuel Martin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160701162920.19632-6-s.martin49@gmail.com \
    --to=s.martin49@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox