From: xantares <xantares09@hotmail.com>
Date: Wed, 14 Aug 2013 18:23:08 +0000 (+0200)
Subject: Added mingw-w64 toolchain files
X-Git-Tag: v1.1rc1~20
X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=commitdiff_plain;h=016ad174031f03588b526ba873c6e14343199dab;hp=6d4f7fbac8e34f674ce9b4c82492af2bed014541

Added mingw-w64 toolchain files
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c7a6a5..1e74b7f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -196,7 +196,7 @@ if ( UNIX )
   
   set ( LIBFTDI_USE_FILE ${CMAKE_INSTALL_PREFIX}/${LIBFTDI_CMAKE_CONFIG_DIR}/UseLibFTDI1.cmake )
   configure_file ( LibFTDI1Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake @ONLY )
-  install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake UseLibFTDI1.cmake
+  install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake cmake/UseLibFTDI1.cmake
             DESTINATION ${LIBFTDI_CMAKE_CONFIG_DIR}
           )
 endif ()
diff --git a/Toolchain-Crossbuild32.cmake b/cmake/Toolchain-Crossbuild32.cmake
similarity index 100%
rename from Toolchain-Crossbuild32.cmake
rename to cmake/Toolchain-Crossbuild32.cmake
diff --git a/Toolchain-mingw32.cmake b/cmake/Toolchain-i686-w64-mingw32.cmake
similarity index 70%
copy from Toolchain-mingw32.cmake
copy to cmake/Toolchain-i686-w64-mingw32.cmake
index bff3cba..1eed0cf 100644
--- a/Toolchain-mingw32.cmake
+++ b/cmake/Toolchain-i686-w64-mingw32.cmake
@@ -2,11 +2,11 @@
 SET(CMAKE_SYSTEM_NAME Windows)
 
 # which compilers to use for C and C++
-SET(CMAKE_C_COMPILER i386-mingw32msvc-gcc)
-SET(CMAKE_CXX_COMPILER i386-mingw32msvc-g++)
+SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
+SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
 
 # here is the target environment located
-SET(CMAKE_FIND_ROOT_PATH  /opt/cross/i386-mingw32msvc )
+SET(CMAKE_FIND_ROOT_PATH  /usr/i686-w64-mingw32 )
 
 # adjust the default behaviour of the FIND_XXX() commands:
 # search headers and libraries in the target environment, search 
@@ -14,3 +14,4 @@ SET(CMAKE_FIND_ROOT_PATH  /opt/cross/i386-mingw32msvc )
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set (CMAKE_RC_COMPILER i686-w64-mingw32-windres)
diff --git a/Toolchain-mingw32.cmake b/cmake/Toolchain-mingw32.cmake
similarity index 100%
copy from Toolchain-mingw32.cmake
copy to cmake/Toolchain-mingw32.cmake
diff --git a/Toolchain-mingw32.cmake b/cmake/Toolchain-x86_64-w64-mingw32.cmake
similarity index 69%
rename from Toolchain-mingw32.cmake
rename to cmake/Toolchain-x86_64-w64-mingw32.cmake
index bff3cba..20a5b40 100644
--- a/Toolchain-mingw32.cmake
+++ b/cmake/Toolchain-x86_64-w64-mingw32.cmake
@@ -2,11 +2,11 @@
 SET(CMAKE_SYSTEM_NAME Windows)
 
 # which compilers to use for C and C++
-SET(CMAKE_C_COMPILER i386-mingw32msvc-gcc)
-SET(CMAKE_CXX_COMPILER i386-mingw32msvc-g++)
+SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
 
 # here is the target environment located
-SET(CMAKE_FIND_ROOT_PATH  /opt/cross/i386-mingw32msvc )
+SET(CMAKE_FIND_ROOT_PATH  /usr/x86_64-w64-mingw32 )
 
 # adjust the default behaviour of the FIND_XXX() commands:
 # search headers and libraries in the target environment, search 
@@ -14,3 +14,4 @@ SET(CMAKE_FIND_ROOT_PATH  /opt/cross/i386-mingw32msvc )
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set (CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
diff --git a/UseLibFTDI1.cmake b/cmake/UseLibFTDI1.cmake
similarity index 100%
rename from UseLibFTDI1.cmake
rename to cmake/UseLibFTDI1.cmake