From 25a3a7f0ff01c45f24eb15f63cadbe904a54cec1 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 25 Jul 2013 18:36:14 +1000 Subject: package hdf5: add prefixed compiler wrappers and add to cmake toolchain file --- src/gcc.mk | 2 ++ src/hdf5.mk | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/gcc.mk b/src/gcc.mk index db0b857..98e4205 100644 --- a/src/gcc.mk +++ b/src/gcc.mk @@ -75,6 +75,8 @@ define $(PKG)_POST_BUILD echo 'set(CMAKE_CXX_COMPILER $(PREFIX)/bin/$(TARGET)-g++)'; \ echo 'set(CMAKE_Fortran_COMPILER $(PREFIX)/bin/$(TARGET)-gfortran)'; \ echo 'set(CMAKE_RC_COMPILER $(PREFIX)/bin/$(TARGET)-windres)'; \ + echo 'set(HDF5_C_COMPILER_EXECUTABLE $(PREFIX)/bin/$(TARGET)-h5cc)'; \ + echo 'set(HDF5_CXX_COMPILER_EXECUTABLE $(PREFIX)/bin/$(TARGET)-h5c++)'; \ echo 'set(PKG_CONFIG_EXECUTABLE $(PREFIX)/bin/$(TARGET)-pkg-config)'; \ echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/$(TARGET)/qt/bin/qmake)'; \ echo 'set(CMAKE_INSTALL_PREFIX $(PREFIX)/$(TARGET) CACHE PATH "Installation Prefix")'; \ diff --git a/src/hdf5.mk b/src/hdf5.mk index 78dea24..2b9a5fa 100644 --- a/src/hdf5.mk +++ b/src/hdf5.mk @@ -51,6 +51,10 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)'/hl/c++/src -j '$(JOBS)' $(MAKE) -C '$(1)'/hl/c++/src -j 1 install + # install prefixed wrapper scripts + $(INSTALL) -m755 '$(1)'/tools/misc/h5cc '$(PREFIX)/bin/$(TARGET)-h5cc' + $(INSTALL) -m755 '$(1)'/c++/src/h5c++ '$(PREFIX)/bin/$(TARGET)-h5c++' + ## test hdf5 '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ -- cgit v0.12