diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2020-01-25 01:51:23 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2020-01-25 01:51:23 +0300 |
| commit | bdff7fc4fbf039688010eeac7a2860d841fc2d1f (patch) | |
| tree | 4b559755125e6c35ad83fc0a5892a5b3afa19df5 | |
| parent | support all 4 cmake default configurations (diff) | |
| download | cmake-common-bdff7fc4fbf039688010eeac7a2860d841fc2d1f.tar.gz cmake-common-bdff7fc4fbf039688010eeac7a2860d841fc2d1f.zip | |
boost/cmake: specify Windows explicitly in toolchains
| -rw-r--r-- | boost/toolchains/mingw-w64-x64-exe.jam | 2 | ||||
| -rw-r--r-- | boost/toolchains/mingw-w64-x64.jam | 2 | ||||
| -rw-r--r-- | boost/toolchains/mingw-w64-x86-exe.jam | 2 | ||||
| -rw-r--r-- | boost/toolchains/mingw-w64-x86.jam | 2 | ||||
| -rw-r--r-- | cmake/toolchains/mingw-w64-x64.cmake | 1 | ||||
| -rw-r--r-- | cmake/toolchains/mingw-w64-x86.cmake | 1 |
6 files changed, 6 insertions, 4 deletions
diff --git a/boost/toolchains/mingw-w64-x64-exe.jam b/boost/toolchains/mingw-w64-x64-exe.jam index 3358a92..46ab535 100644 --- a/boost/toolchains/mingw-w64-x64-exe.jam +++ b/boost/toolchains/mingw-w64-x64-exe.jam @@ -1 +1 @@ -using gcc : : x86_64-w64-mingw32-g++.exe ; +using gcc : : x86_64-w64-mingw32-g++.exe : <target-os>windows ; diff --git a/boost/toolchains/mingw-w64-x64.jam b/boost/toolchains/mingw-w64-x64.jam index 799c943..f52acfa 100644 --- a/boost/toolchains/mingw-w64-x64.jam +++ b/boost/toolchains/mingw-w64-x64.jam @@ -1 +1 @@ -using gcc : : x86_64-w64-mingw32-g++ ; +using gcc : : x86_64-w64-mingw32-g++ : <target-os>windows ; diff --git a/boost/toolchains/mingw-w64-x86-exe.jam b/boost/toolchains/mingw-w64-x86-exe.jam index ad06bf3..87beca0 100644 --- a/boost/toolchains/mingw-w64-x86-exe.jam +++ b/boost/toolchains/mingw-w64-x86-exe.jam @@ -1 +1 @@ -using gcc : : i686-w64-mingw32-g++.exe ; +using gcc : : i686-w64-mingw32-g++.exe : <target-os>windows ; diff --git a/boost/toolchains/mingw-w64-x86.jam b/boost/toolchains/mingw-w64-x86.jam index 27452b0..e73f190 100644 --- a/boost/toolchains/mingw-w64-x86.jam +++ b/boost/toolchains/mingw-w64-x86.jam @@ -1 +1 @@ -using gcc : : i686-w64-mingw32-g++ ; +using gcc : : i686-w64-mingw32-g++ : <target-os>windows ; diff --git a/cmake/toolchains/mingw-w64-x64.cmake b/cmake/toolchains/mingw-w64-x64.cmake index 6009edf..c689d39 100644 --- a/cmake/toolchains/mingw-w64-x64.cmake +++ b/cmake/toolchains/mingw-w64-x64.cmake @@ -1,3 +1,4 @@ set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc) set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++) set(CMAKE_RC_COMILER x86_64-w64-mingw32-windres) +set(CMAKE_SYSTEM_NAME Windows) diff --git a/cmake/toolchains/mingw-w64-x86.cmake b/cmake/toolchains/mingw-w64-x86.cmake index b0c717f..e5dedd4 100644 --- a/cmake/toolchains/mingw-w64-x86.cmake +++ b/cmake/toolchains/mingw-w64-x86.cmake @@ -1,3 +1,4 @@ set(CMAKE_C_COMPILER i686-w64-mingw32-gcc) set(CMAKE_CXX_COMPILER i686-w64-mingw32-g++) set(CMAKE_RC_COMILER i686-w64-mingw32-windres) +set(CMAKE_SYSTEM_NAME Windows) |