From 5891a376358a3ad0d604c09da09f06c8690a1c36 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Thu, 6 Aug 2009 13:14:11 +0200 Subject: [PATCH] Win32Toolchain: define MINGW_PREFIX and QT_HEADERS_DIR MINGW_PREFIX is a better variable name than CC_PREFIX (cross copmling prefix), therefore rename it. Furthermore define QT_HEADERS_DIR due to changed logic in CMake's FindQt4 module. (cherry picked from commit 94ebcf30bc85892bb0c825fe3e2792a97a81c0c6) --- cmake/modules/Win32Toolchain.cmake | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/cmake/modules/Win32Toolchain.cmake b/cmake/modules/Win32Toolchain.cmake index 8318ed367..6d5030107 100644 --- a/cmake/modules/Win32Toolchain.cmake +++ b/cmake/modules/Win32Toolchain.cmake @@ -1,26 +1,28 @@ +SET(MINGW_PREFIX /opt/mingw32) + # this one is important SET(CMAKE_SYSTEM_NAME Windows) #this one not so much SET(CMAKE_SYSTEM_VERSION 1) SET(CMAKE_SYSTEM_PROCESSOR i686) -SET(CMAKE_INSTALL_PREFIX /opt/mingw32) +SET(CMAKE_INSTALL_PREFIX ${MINGW_PREFIX}) -SET(CC_PREFIX /opt/mingw32) # specify the cross compiler -SET(CMAKE_C_COMPILER ${CC_PREFIX}/bin/i586-pc-mingw32-gcc) -SET(CMAKE_CXX_COMPILER ${CC_PREFIX}/bin/i586-pc-mingw32-g++) +SET(CMAKE_C_COMPILER ${MINGW_PREFIX}/bin/i586-pc-mingw32-gcc) +SET(CMAKE_CXX_COMPILER ${MINGW_PREFIX}/bin/i586-pc-mingw32-g++) # where is the target environment SET(CMAKE_FIND_ROOT_PATH /opt/mingw32) -SET(QT_BINARY_DIR ${CC_PREFIX}/bin) -SET(QT_LIBRARY_DIR ${CC_PREFIX}/lib) -SET(QT_QTCORE_LIBRARY ${CC_PREFIX}/lib/libQtCore4.a) -SET(QT_INCLUDE_DIR ${CC_PREFIX}/include/qt4) -SET(QT_QTCORE_INCLUDE_DIR ${CC_PREFIX}/include/qt4/QtCore) -SET(QT_MKSPECS_DIR ${CC_PREFIX}/share/qt4/mkspecs) +SET(QT_BINARY_DIR ${MINGW_PREFIX}/bin) +SET(QT_LIBRARY_DIR ${MINGW_PREFIX}/lib) +SET(QT_QTCORE_LIBRARY ${MINGW_PREFIX}/lib/libQtCore4.a) +SET(QT_INCLUDE_DIR ${MINGW_PREFIX}/include/qt4) +SET(QT_HEADERS_DIR ${MINGW_PREFIX}/include/qt4) +SET(QT_QTCORE_INCLUDE_DIR ${MINGW_PREFIX}/include/qt4/QtCore) +SET(QT_MKSPECS_DIR ${MINGW_PREFIX}/share/qt4/mkspecs) SET(QT_MOC_EXECUTABLE ${QT_BINARY_DIR}/moc.exe) SET(QT_RCC_EXECUTABLE ${QT_BINARY_DIR}/rcc.exe) SET(QT_QMAKE_EXECUTABLE /usr/bin/qmake) @@ -32,8 +34,8 @@ 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(PKG_CONFIG_EXECUTABLE ${CC_PREFIX}/bin/pkg-config) +SET(PKG_CONFIG_EXECUTABLE ${MINGW_PREFIX}/bin/pkg-config) -INCLUDE_DIRECTORIES(${CC_PREFIX}/include) -LINK_DIRECTORIES(${CC_PREFIX}/lib ${CC_PREFIX}/bin) +INCLUDE_DIRECTORIES(${MINGW_PREFIX}/include) +LINK_DIRECTORIES(${MINGW_PREFIX}/lib ${MINGW_PREFIX}/bin)