diff options
| author | woglinde <woglinde@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-10-27 22:31:06 +0000 |
|---|---|---|
| committer | woglinde <woglinde@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-10-27 22:31:06 +0000 |
| commit | 1f0aae7b32fef708454c57f1d8e2eea0f60c5f82 (patch) | |
| tree | 7d6c8b877765ea0131e0f228837c5f6d5ed738ed /Toolchain | |
| parent | dd577215693dce66072ff20a0fa2d0cfdd6eb24f (diff) | |
| download | navit-svn-1f0aae7b32fef708454c57f1d8e2eea0f60c5f82.tar.gz | |
Fix:build/cmake:fix mingw support for ubuntu 14.04 and above
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5916 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'Toolchain')
| -rw-r--r-- | Toolchain/mingw32.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Toolchain/mingw32.cmake b/Toolchain/mingw32.cmake index 31b7ad99..d00e7d6a 100644 --- a/Toolchain/mingw32.cmake +++ b/Toolchain/mingw32.cmake @@ -1,14 +1,14 @@ SET(CMAKE_SYSTEM_NAME Windows) -FIND_PROGRAM(CMAKE_C_COMPILER NAMES i686-w64-mingw32-gcc i686-mingw32-gcc i586-mingw32-gcc i386-mingw32-gcc mingw32-gcc) -FIND_PROGRAM(CMAKE_CXX_COMPILER NAMES i686-w64-mingw32-g++ i686-mingw32-g++ i586-mingw32-gcc i386-mingw32-gcc mingw32-g++) +FIND_PROGRAM(CMAKE_C_COMPILER NAMES i686-w64-mingw32-gcc i686-mingw32-gcc i586-mingw32-gcc i386-mingw32-gcc i586-mingw32msvc-gcc mingw32-gcc) +FIND_PROGRAM(CMAKE_CXX_COMPILER NAMES i686-w64-mingw32-g++ i686-mingw32-g++ i586-mingw32-g++ i386-mingw32-g++ i586-mingw32msvc-g++ mingw32-g++) -FIND_PROGRAM(CMAKE_RC_COMPILER_INIT NAMES i686-w64-mingw32-windres i686-mingw32-windres i586-mingw32-windres i386-mingw32-windres mingw32-windres windres.exe) +FIND_PROGRAM(CMAKE_RC_COMPILER_INIT NAMES i686-w64-mingw32-windres i686-mingw32-windres i586-mingw32-windres i386-mingw32-windres mingw32-windres i586-mingw32msvc-windres windres.exe) -FIND_PROGRAM(CMAKE_AR NAMES i686-w64-mingw32-ar i686-mingw32-ar i586-mingw32-ar i386-mingw32-ar mingw32-ar ar.exe) +FIND_PROGRAM(CMAKE_AR NAMES i686-w64-mingw32-ar i686-mingw32-ar i586-mingw32-ar i386-mingw32-ar i586-mingw32msvc-ar mingw32-ar ar.exe) IF (NOT CMAKE_FIND_ROOT_PATH) -EXECUTE_PROCESS( +EXECUTE_PROCESS( COMMAND ${CMAKE_C_COMPILER} -print-sysroot OUTPUT_VARIABLE CMAKE_FIND_ROOT_PATH ) |