epienbro pushed to mingw-filesystem (el6). "Remove unused and broken Boost_COMPILER from CMake toolchain files"

notifications at fedoraproject.org notifications at fedoraproject.org
Sat Apr 11 18:49:17 UTC 2015


>From aad18c0124a23f3e1cec584bd69bf26af6c654c2 Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Fri, 10 Apr 2015 18:06:22 +0200
Subject: Remove unused and broken Boost_COMPILER from CMake toolchain files


diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 414b014..908d653 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -315,6 +315,8 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
     and /usr/share/data/mingw/toolchain-mingw64.cmake don't have
     an uppercase character in their file name any more
   * Add CMAKE_SYSTEM_PROCESSOR to the CMake toolchain files
+  * Removed Boost_COMPILER from the CMake toolchain files as
+    it was unused and broken anyway
 
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake
index 878257d..70f6441 100644
--- a/toolchain-mingw32.cmake
+++ b/toolchain-mingw32.cmake
@@ -20,9 +20,6 @@ SET(QT_BINARY_DIR /usr/i686-w64-mingw32/bin /usr/bin)
 # set the resource compiler (RHBZ #652435)
 SET(CMAKE_RC_COMPILER /usr/bin/i686-w64-mingw32-windres)
 
-# override boost library suffix which defaults to -mgw
-SET(Boost_COMPILER -gcc47)
-
 # These are needed for compiling lapack (RHBZ #753906)
 SET(CMAKE_Fortran_COMPILER /usr/bin/i686-w64-mingw32-gfortran)
 SET(CMAKE_AR:FILEPATH /usr/bin/i686-w64-mingw32-ar)
diff --git a/toolchain-mingw64.cmake b/toolchain-mingw64.cmake
index d6b36a7..b323e11 100644
--- a/toolchain-mingw64.cmake
+++ b/toolchain-mingw64.cmake
@@ -20,9 +20,6 @@ SET(QT_BINARY_DIR /usr/x86_64-w64-mingw32/bin /usr/bin)
 # set the resource compiler (RHBZ #652435)
 SET(CMAKE_RC_COMPILER /usr/bin/x86_64-w64-mingw32-windres)
 
-# override boost library suffix which defaults to -mgw
-SET(Boost_COMPILER -gcc47)
-
 # These are needed for compiling lapack (RHBZ #753906)
 SET(CMAKE_Fortran_COMPILER /usr/bin/x86_64-w64-mingw32-gfortran)
 SET(CMAKE_AR:FILEPATH /usr/bin/x86_64-w64-mingw32-ar)
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mingw-filesystem.git/commit/?h=el6&id=aad18c0124a23f3e1cec584bd69bf26af6c654c2


More information about the scm-commits mailing list