epienbro pushed to mingw-filesystem (f20). "Rename Toolchain-mingw{32, 64}.cmake to toolchain-mingw{32, 64}.cmake"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 11 18:51:04 UTC 2015
>From faf1180f1185bd8887f6408cab9054df256fbd97 Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Fri, 10 Apr 2015 18:01:30 +0200
Subject: Rename Toolchain-mingw{32,64}.cmake to toolchain-mingw{32,64}.cmake
diff --git a/Toolchain-mingw32.cmake b/Toolchain-mingw32.cmake
deleted file mode 100644
index da8846b..0000000
--- a/Toolchain-mingw32.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-SET(CMAKE_SYSTEM_NAME Windows)
-
-# specify the cross compiler
-SET(CMAKE_C_COMPILER /usr/bin/i686-w64-mingw32-gcc)
-SET(CMAKE_CXX_COMPILER /usr/bin/i686-w64-mingw32-g++)
-
-# where is the target environment
-SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32/sys-root/mingw)
-
-# search for programs in the build host directories
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-# for libraries and headers in the target directories
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-# Make sure Qt can be detected by CMake
-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)
-SET(CMAKE_RANLIB:FILEPATH /usr/bin/i686-w64-mingw32-ranlib)
-
diff --git a/Toolchain-mingw64.cmake b/Toolchain-mingw64.cmake
deleted file mode 100644
index 5f70ced..0000000
--- a/Toolchain-mingw64.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-SET(CMAKE_SYSTEM_NAME Windows)
-
-# specify the cross compiler
-SET(CMAKE_C_COMPILER /usr/bin/x86_64-w64-mingw32-gcc)
-SET(CMAKE_CXX_COMPILER /usr/bin/x86_64-w64-mingw32-g++)
-
-# where is the target environment
-SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32/sys-root/mingw)
-
-# search for programs in the build host directories
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-# for libraries and headers in the target directories
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-# Make sure Qt can be detected by CMake
-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)
-SET(CMAKE_RANLIB:FILEPATH /usr/bin/x86_64-w64-mingw32-ranlib)
-
diff --git a/macros.mingw32 b/macros.mingw32
index 6f96afc..ebb2ab7 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -135,7 +135,7 @@
-DSHARE_INSTALL_PREFIX:PATH=%{mingw32_datadir} \\\
%{?_cmake_skip_rpath} \\\
-DBUILD_SHARED_LIBS:BOOL=ON \\\
- -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/Toolchain-mingw32.cmake \\\
+ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw32.cmake \\\
${MINGW_CMAKE_ARGS} \\\
${MINGW32_CMAKE_ARGS} \\\
"$@" $__mingw32_topdir
diff --git a/macros.mingw64 b/macros.mingw64
index 77deb3c..7f65e24 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -135,7 +135,7 @@
-DSHARE_INSTALL_PREFIX:PATH=%{mingw64_datadir} \\\
%{?_cmake_skip_rpath} \\\
-DBUILD_SHARED_LIBS:BOOL=ON \\\
- -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/Toolchain-mingw64.cmake \\\
+ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw64.cmake \\\
${MINGW_CMAKE_ARGS} \\\
${MINGW64_CMAKE_ARGS} \\\
"$@" $__mingw64_topdir
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 6377b2b..ea9bc69 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,8 +6,8 @@
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
Name: mingw-filesystem
-Version: 99
-Release: 5%{?dist}
+Version: 100
+Release: 1%{?dist}
Summary: MinGW cross compiler base filesystem and environment
Group: Development/Libraries
@@ -26,8 +26,8 @@ Source7: mingw-find-requires.sh
Source8: mingw-find-provides.sh
Source9: mingw-scripts.sh
Source10: mingw-rpmlint.config
-Source11: Toolchain-mingw32.cmake
-Source12: Toolchain-mingw64.cmake
+Source11: toolchain-mingw32.cmake
+Source12: toolchain-mingw64.cmake
Source13: mingw-find-lang.sh
Source14: mingw32.attr
Source15: mingw64.attr
@@ -294,7 +294,7 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
%{_bindir}/mingw32-pkg-config
%{_prefix}/i686-w64-mingw32
%{_rpmconfigdir}/fileattrs/mingw32.attr
-%{_datadir}/mingw/Toolchain-mingw32.cmake
+%{_datadir}/mingw/toolchain-mingw32.cmake
%files -n mingw64-filesystem
%{macrosdir}/macros.mingw64
@@ -305,10 +305,16 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
%{_bindir}/mingw64-pkg-config
%{_prefix}/x86_64-w64-mingw32
%{_rpmconfigdir}/fileattrs/mingw64.attr
-%{_datadir}/mingw/Toolchain-mingw64.cmake
+%{_datadir}/mingw/toolchain-mingw64.cmake
%changelog
+* Sat Apr 11 2015 Erik van Pienbroek <epienbro at fedoraproject.org> - 100-1
+- Various CMake improvements:
+ * The toolchain files /usr/share/data/mingw/toolchain-mingw32.cmake
+ and /usr/share/data/mingw/toolchain-mingw64.cmake don't have
+ an uppercase character in their file name any more
+
* 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
new file mode 100644
index 0000000..da8846b
--- /dev/null
+++ b/toolchain-mingw32.cmake
@@ -0,0 +1,29 @@
+SET(CMAKE_SYSTEM_NAME Windows)
+
+# specify the cross compiler
+SET(CMAKE_C_COMPILER /usr/bin/i686-w64-mingw32-gcc)
+SET(CMAKE_CXX_COMPILER /usr/bin/i686-w64-mingw32-g++)
+
+# where is the target environment
+SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32/sys-root/mingw)
+
+# search for programs in the build host directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+# for libraries and headers in the target directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+# Make sure Qt can be detected by CMake
+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)
+SET(CMAKE_RANLIB:FILEPATH /usr/bin/i686-w64-mingw32-ranlib)
+
diff --git a/toolchain-mingw64.cmake b/toolchain-mingw64.cmake
new file mode 100644
index 0000000..5f70ced
--- /dev/null
+++ b/toolchain-mingw64.cmake
@@ -0,0 +1,29 @@
+SET(CMAKE_SYSTEM_NAME Windows)
+
+# specify the cross compiler
+SET(CMAKE_C_COMPILER /usr/bin/x86_64-w64-mingw32-gcc)
+SET(CMAKE_CXX_COMPILER /usr/bin/x86_64-w64-mingw32-g++)
+
+# where is the target environment
+SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32/sys-root/mingw)
+
+# search for programs in the build host directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+# for libraries and headers in the target directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+# Make sure Qt can be detected by CMake
+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)
+SET(CMAKE_RANLIB:FILEPATH /usr/bin/x86_64-w64-mingw32-ranlib)
+
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/mingw-filesystem.git/commit/?h=f20&id=faf1180f1185bd8887f6408cab9054df256fbd97
More information about the scm-commits
mailing list