rpms/mingw-filesystem
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add Boost_ARCHITECTURE to cmake toolchain file

Browse Source
This commit is contained in:
Sandro Mani 2022-01-09 09:19:07 +01:00
parent f9b54363f1
commit 9257d2c01d
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mingw-filesystem.spec
View File

@ -6,7 +6,7 @@
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
Name: mingw-filesystem
Version: 127
Version: 128
Release: 1%{?dist}
Summary: MinGW cross compiler base filesystem and environment
@ -358,6 +358,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
%changelog
* Sat Jan 08 2022 Sandro Mani <manisandro@gmail.com> - 128-1
- Add Boost_ARCHITECTURE to cmake toolchain file
* Sat Jan 08 2022 Sandro Mani <manisandro@gmail.com> - 127-1
- Correctly test whether CC/CXX/FC env-vars are set in cmake toolchain config

2
toolchain-mingw32.cmake
View File

@ -33,3 +33,5 @@ ENDIF()
SET(CMAKE_AR:FILEPATH /usr/bin/i686-w64-mingw32-ar)
SET(CMAKE_RANLIB:FILEPATH /usr/bin/i686-w64-mingw32-ranlib)
# Workaround failure to detect boost (see #2037724)
SET(Boost_ARCHITECTURE "-x32")

3
toolchain-mingw64.cmake
View File

@ -1,5 +1,6 @@
SET(CMAKE_SYSTEM_NAME Windows)
SET(CMAKE_SYSTEM_PROCESSOR x86_64)
# specify the cross compiler
IF(NOT DEFINED ENV{CC})
SET(CMAKE_C_COMPILER /usr/bin/x86_64-w64-mingw32-gcc)
@ -32,3 +33,5 @@ ENDIF()
SET(CMAKE_AR:FILEPATH /usr/bin/x86_64-w64-mingw32-ar)
SET(CMAKE_RANLIB:FILEPATH /usr/bin/x86_64-w64-mingw32-ranlib)
# Workaround failure to detect boost (see #2037724)
SET(Boost_ARCHITECTURE "-x64")