Refactoring:mingw:simplify toolchain

4 files changed, 33 insertions, 38 deletions

diff --git a/Toolchain/arm-mingw32ce.cmake b/Toolchain/arm-mingw32ce.cmake
deleted file mode 100644
index 4ccdd22c4..000000000
--- a/Toolchain/arm-mingw32ce.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-SET(CMAKE_SYSTEM_NAME WINCE)
-
-# specify the cross compiler
-FIND_PROGRAM(CMAKE_C_COMPILER NAMES arm-mingw32ce-gcc arm-wince-mingw32ce-gcc)
-FIND_PROGRAM(CMAKE_CXX_COMPILER NAMES arm-mingw32ce-g++ arm-wince-mingw32ce-g++)
-FIND_PROGRAM(CMAKE_RC_COMPILER_INIT NAMES arm-mingw32ce-windres arm-wince-mingw32ce-windres)
-SET(PKG_CONFIG_EXECUTABLE "arm-mingw32ce-pkg-config")
-SET(WINCE TRUE)
diff --git a/Toolchain/i386-mingw32ce.cmake b/Toolchain/i386-mingw32ce.cmake
deleted file mode 100644
index a1cc562f6..000000000
--- a/Toolchain/i386-mingw32ce.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-SET(CMAKE_SYSTEM_NAME WINCE)
-
-# specify the cross compiler
-FIND_PROGRAM(CMAKE_C_COMPILER NAMES i386-mingw32ce-gcc )
-FIND_PROGRAM(CMAKE_CXX_COMPILER NAMES i386-mingw32ce-g++ )
-FIND_PROGRAM(CMAKE_RC_COMPILER_INIT NAMES i386-mingw32ce-windres )
-SET(PKG_CONFIG_EXECUTABLE "i386-mingw32ce-pkg-config")
-SET(WINCE TRUE)
diff --git a/Toolchain/mingw.cmake b/Toolchain/mingw.cmake
new file mode 100644
index 000000000..5ade65c3b
--- /dev/null
+++ b/Toolchain/mingw.cmake
@@ -0,0 +1,33 @@
+SET(CMAKE_C_COMPILER ${TARGET_ARCH}-gcc)
+SET(CMAKE_CXX_COMPILER ${TARGET_ARCH}-g++)
+SET(CMAKE_RC_COMPILER_INIT ${TARGET_ARCH}-windres)
+SET(PKG_CONFIG_EXECUTABLE ${TARGET_ARCH}-pkg-config)
+
+# unecessary according to https://cmake.org/cmake/help/v3.4/variable/WINCE.html
+# TODO: plateform wince change too much things for now, fix later.
+if (CMAKE_SYSTEM_NAME STREQUAL "WindowsCEtest")
+  SET(CMAKE_EXECUTABLE_SUFFIX ".exe")
+  SET(WINCE TRUE)
+endif()
+
+if(WINCE)
+  # MINGW32CE_PATH is set in dockerfile
+  message(STATUS "Wince toolchain in $ENV{MINGW32CE_PATH}")
+
+  #SET(CMAKE_FIND_ROOT_PATH $ENV{MINGW32CE_PATH})
+  #SET(CMAKE_INSTALL_PREFIX $ENV{MINGW32CE_PATH})
+endif(WINCE)
+
+if(WIN32)
+  message(STATUS "WIN32 case")
+  #SET(CMAKE_FIND_ROOT_PATH ${MINGW_INSTALL_PREFIX})
+  #SET(QT_MOC_EXECUTABLE bin/moc)
+  #SET(QT_RCC_EXECUTABLE ${MINGW_INSTALL_PREFIX}/bin/rcc)
+  #SET(QT_UIC_EXECUTABLE ${MINGW_INSTALL_PREFIX}/bin/uic)
+  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_FIND_ROOT_PATH ${MINGW_INSTALL_PREFIX})
+  SET(CMAKE_INSTALL_PREFIX ${MINGW_INSTALL_PREFIX})
+endif()
diff --git a/Toolchain/mingw32.cmake b/Toolchain/mingw32.cmake
deleted file mode 100644
index f16eb51ad..000000000
--- a/Toolchain/mingw32.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-SET(CMAKE_SYSTEM_NAME Windows)
-
-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 i586-mingw32msvc-windres windres.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)
-
-FIND_PROGRAM(PKG_CONFIG_EXECUTABLE i686-w64-mingw32-pkg-config mingw32-pkg-config)
-
-IF (NOT CMAKE_FIND_ROOT_PATH)
-EXECUTE_PROCESS(
-   COMMAND ${CMAKE_C_COMPILER} -print-sysroot
-   OUTPUT_VARIABLE CMAKE_FIND_ROOT_PATH
-)
-ENDIF(NOT CMAKE_FIND_ROOT_PATH)
-
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)