From 3c67cefde7f1443f5eaf36809d3c9a1f0a620681 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Mon, 8 Dec 2014 20:22:39 +1100
Subject: boost hdf5 pkgconf qt: move cmake variables to respective packages

---
 src/boost.mk   | 4 ++++
 src/hdf5.mk    | 6 ++++++
 src/pkgconf.mk | 5 +----
 src/qt.mk      | 5 +++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/boost.mk b/src/boost.mk
index a418bbf..ae57abd 100644
--- a/src/boost.mk
+++ b/src/boost.mk
@@ -61,6 +61,10 @@ define $(PKG)_BUILD
     $(if $(BUILD_SHARED), \
         mv -fv '$(PREFIX)/$(TARGET)/lib/'libboost_*.dll '$(PREFIX)/$(TARGET)/bin/')
 
+    # setup cmake toolchain
+    $(SED) -i '/Boost_THREADAPI/d' '$(CMAKE_TOOLCHAIN_FILE)'
+    echo 'set(Boost_THREADAPI "win32")' >> '$(CMAKE_TOOLCHAIN_FILE)'
+
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -U__STRICT_ANSI__ -pedantic \
         '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-boost.exe' \
diff --git a/src/hdf5.mk b/src/hdf5.mk
index 393f190..47c8447 100644
--- a/src/hdf5.mk
+++ b/src/hdf5.mk
@@ -59,6 +59,12 @@ define $(PKG)_BUILD
     $(INSTALL) -m755 '$(1)'/tools/misc/h5cc '$(PREFIX)/bin/$(TARGET)-h5cc'
     $(INSTALL) -m755 '$(1)'/c++/src/h5c++   '$(PREFIX)/bin/$(TARGET)-h5c++'
 
+    # setup cmake toolchain
+    $(SED) -i '/HDF5/d' '$(CMAKE_TOOLCHAIN_FILE)'
+    (echo 'set(HDF5_C_COMPILER_EXECUTABLE $(PREFIX)/bin/$(TARGET)-h5cc)'; \
+     echo 'set(HDF5_CXX_COMPILER_EXECUTABLE $(PREFIX)/bin/$(TARGET)-h5c++)'; \
+     ) >> '$(CMAKE_TOOLCHAIN_FILE)'
+
     ## test hdf5
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
diff --git a/src/pkgconf.mk b/src/pkgconf.mk
index fd2fae9..9a23619 100644
--- a/src/pkgconf.mk
+++ b/src/pkgconf.mk
@@ -41,6 +41,7 @@ define $(PKG)_BUILD_COMMON
     chmod 0755 '$(PREFIX)/bin/$(TARGET)-pkg-config'
 
     # create the CMake toolchain file
+    # individual packages (e.g. hdf5) should remove/append their own entries
     [ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))'
     (echo 'set(CMAKE_SYSTEM_NAME Windows)'; \
      echo 'set(MSYS 1)'; \
@@ -60,11 +61,7 @@ define $(PKG)_BUILD_COMMON
      echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")'; \
      echo 'set(CMAKE_CROSS_COMPILING ON) # Workaround for http://www.cmake.org/Bug/view.php?id=14075'; \
      echo 'set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <FLAGS> <DEFINES> -o <OBJECT> <SOURCE>") # Workaround for buggy windres rules'; \
-     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(Boost_THREADAPI "win32")'; \
      ) > '$(CMAKE_TOOLCHAIN_FILE)'
 endef
 
diff --git a/src/qt.mk b/src/qt.mk
index 889394e..ea0a2b9 100644
--- a/src/qt.mk
+++ b/src/qt.mk
@@ -110,6 +110,11 @@ define $(PKG)_BUILD
         '$(TOP_DIR)/src/qt-test.cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-pkgconfig.exe' \
         -I'$(1)/test-$(PKG)-pkgconfig' \
         `'$(TARGET)-pkg-config' QtGui --cflags --libs`
+
+    # setup cmake toolchain
+    $(SED) -i '/QT_QMAKE_EXECUTABLE/d' '$(CMAKE_TOOLCHAIN_FILE)'
+    echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/$(TARGET)/qt/bin/qmake)' >> '$(CMAKE_TOOLCHAIN_FILE)'
+
 endef
 
 $(PKG)_BUILD_SHARED = $(subst -static ,-shared ,\
-- 
cgit v0.12