From 8a6cf7cab7ab03217fd8e6c305eabc7d2913a4b3 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Mon, 22 Sep 2014 21:53:47 -0700
Subject: qt5: try to fix CMake files

See #466.

This is one of the worst hacks I've ever seen. If there is a way to fix
this better, please mention on #466.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
---
 src/qt5.mk                | 6 ++++++
 src/qtactiveqt.mk         | 2 ++
 src/qtbase.mk             | 2 ++
 src/qtconnectivity.mk     | 2 ++
 src/qtdeclarative.mk      | 2 ++
 src/qtenginio.mk          | 2 ++
 src/qtgraphicaleffects.mk | 2 ++
 src/qtimageformats.mk     | 2 ++
 src/qtlocation.mk         | 2 ++
 src/qtmultimedia.mk       | 2 ++
 src/qtquick1.mk           | 2 ++
 src/qtquickcontrols.mk    | 2 ++
 src/qtscript.mk           | 2 ++
 src/qtsensors.mk          | 2 ++
 src/qtserialport.mk       | 2 ++
 src/qtservice.mk          | 2 ++
 src/qtsvg.mk              | 2 ++
 src/qtsystems.mk          | 2 ++
 src/qttools.mk            | 2 ++
 src/qttranslations.mk     | 2 ++
 src/qtwebkit.mk           | 2 ++
 src/qtwebsockets.mk       | 2 ++
 src/qtwinextras.mk        | 2 ++
 src/qtxmlpatterns.mk      | 2 ++
 24 files changed, 52 insertions(+)

diff --git a/src/qt5.mk b/src/qt5.mk
index 4d001f3..c699764 100644
--- a/src/qt5.mk
+++ b/src/qt5.mk
@@ -16,3 +16,9 @@ $(PKG)_DEPS     := $(patsubst $(TOP_DIR)/src/%.mk,%,\
 define $(PKG)_UPDATE
     echo $(qtbase_VERSION)
 endef
+
+define $(PKG)_FIX_CMAKE_FILE
+    $(if $(BUILD_STATIC), \
+        find $(PREFIX)/$(TARGET)/qt5/lib/cmake/ -name '*\.cmake' | \
+        xargs $(SED) -i 's!/\(.*\)\.lib!/lib\1\.a!g')
+endef
diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk
index 35e610a..18957bf 100644
--- a/src/qtactiveqt.mk
+++ b/src/qtactiveqt.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtbase.mk b/src/qtbase.mk
index 4d57d81..5dec03f 100644
--- a/src/qtbase.mk
+++ b/src/qtbase.mk
@@ -62,6 +62,8 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j 1 install
     ln -sf '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PREFIX)/bin/$(TARGET)'-qmake-qt5
 
+    $(qt5_FIX_CMAKE_FILE)
+
     mkdir            '$(1)/test-qt'
     cd               '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qt-test.pro'
     $(MAKE)       -C '$(1)/test-qt' -j '$(JOBS)'
diff --git a/src/qtconnectivity.mk b/src/qtconnectivity.mk
index d070229..3cca1be 100644
--- a/src/qtconnectivity.mk
+++ b/src/qtconnectivity.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtdeclarative.mk b/src/qtdeclarative.mk
index 84bd7fd..dc0fde9 100644
--- a/src/qtdeclarative.mk
+++ b/src/qtdeclarative.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtenginio.mk b/src/qtenginio.mk
index 8952e58..f10b597 100644
--- a/src/qtenginio.mk
+++ b/src/qtenginio.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk
index 1c802f0..6bb4bad 100644
--- a/src/qtgraphicaleffects.mk
+++ b/src/qtgraphicaleffects.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk
index 949cf0f..df437f6 100644
--- a/src/qtimageformats.mk
+++ b/src/qtimageformats.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtlocation.mk b/src/qtlocation.mk
index 22ae68c..8dc3c8d 100644
--- a/src/qtlocation.mk
+++ b/src/qtlocation.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk
index b8e67a3..9313a46 100644
--- a/src/qtmultimedia.mk
+++ b/src/qtmultimedia.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtquick1.mk b/src/qtquick1.mk
index 6df9fe6..e44c198 100644
--- a/src/qtquick1.mk
+++ b/src/qtquick1.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtquickcontrols.mk b/src/qtquickcontrols.mk
index c61c122..8cb8af6 100644
--- a/src/qtquickcontrols.mk
+++ b/src/qtquickcontrols.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtscript.mk b/src/qtscript.mk
index b236c33..14d9e37 100644
--- a/src/qtscript.mk
+++ b/src/qtscript.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtsensors.mk b/src/qtsensors.mk
index 6c4c6ac..692db01 100644
--- a/src/qtsensors.mk
+++ b/src/qtsensors.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtserialport.mk b/src/qtserialport.mk
index 61d2d02..4784d6c 100644
--- a/src/qtserialport.mk
+++ b/src/qtserialport.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtservice.mk b/src/qtservice.mk
index 9413fed..1da91b0 100644
--- a/src/qtservice.mk
+++ b/src/qtservice.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)/qtservice/buildlib' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)/qtservice/buildlib' -j '$(JOBS)'
     $(MAKE) -C '$(1)/qtservice/buildlib' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtsvg.mk b/src/qtsvg.mk
index 75f9fd9..6ded945 100644
--- a/src/qtsvg.mk
+++ b/src/qtsvg.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtsystems.mk b/src/qtsystems.mk
index 163ac16..30b7964 100644
--- a/src/qtsystems.mk
+++ b/src/qtsystems.mk
@@ -19,6 +19,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qttools.mk b/src/qttools.mk
index 97e848e..f0bf94a 100644
--- a/src/qttools.mk
+++ b/src/qttools.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qttranslations.mk b/src/qttranslations.mk
index ac03722..bb95391 100644
--- a/src/qttranslations.mk
+++ b/src/qttranslations.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 :=
diff --git a/src/qtwebkit.mk b/src/qtwebkit.mk
index 2c92bed..9001702 100644
--- a/src/qtwebkit.mk
+++ b/src/qtwebkit.mk
@@ -20,6 +20,8 @@ define $(PKG)_BUILD_SHARED
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' FLEX=flex
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtwebsockets.mk b/src/qtwebsockets.mk
index a2723dd..fd17fda 100644
--- a/src/qtwebsockets.mk
+++ b/src/qtwebsockets.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtwinextras.mk b/src/qtwinextras.mk
index 0137cb4..0907d93 100644
--- a/src/qtwinextras.mk
+++ b/src/qtwinextras.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 =
diff --git a/src/qtxmlpatterns.mk b/src/qtxmlpatterns.mk
index 37e7086..7b370f8 100644
--- a/src/qtxmlpatterns.mk
+++ b/src/qtxmlpatterns.mk
@@ -18,6 +18,8 @@ define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    $(qt5_FIX_CMAKE_FILE)
 endef
 
 $(PKG)_BUILD_i686-pc-mingw32 =
-- 
cgit v0.12