if (NOT DEFINED MINGW_TOOLCHAIN_PREFIX)
if(ARCH STREQUAL "i386")
- if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+ if(CMAKE_HOST_WIN32)
set(MINGW_TOOLCHAIN_PREFIX "" CACHE STRING "MinGW Toolchain Prefix")
else()
- set(MINGW_TOOLCHAIN_PREFIX "mingw32-" CACHE STRING "MinGW Toolchain Prefix")
- endif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+ if(NOT $ENV{_ROSBE_VERSION} VERSION_LESS 2.1)
+ set(MINGW_TOOLCHAIN_PREFIX "i686-w64-mingw32-" CACHE STRING "MinGW-W64 Toolchain Prefix")
+ else()
+ set(MINGW_TOOLCHAIN_PREFIX "mingw32-" CACHE STRING "MinGW Toolchain Prefix")
+ endif()
+ endif()
elseif(ARCH STREQUAL "amd64")
set(MINGW_TOOLCHAIN_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Toolchain Prefix")