[Cmake-commits] [cmake-commits] hoffman committed CMakeDetermineASMCompiler.cmake 1.1.2.1 1.1.2.2 CMakeDetermineCCompiler.cmake 1.52 1.52.2.1 CMakeDetermineCXXCompiler.cmake 1.45 1.45.2.1 CMakeFortranCompilerId.F90.in 1.1 1.1.2.1 CMakeImportBuildSettings.cmake 1.8.12.1 1.8.12.2 FindQt4.cmake 1.96.2.9 1.96.2.10 FindSubversion.cmake 1.2.2.2 1.2.2.3 MacOSXBundleInfo.plist.in NONE 1.4.2.2 UseQt4.cmake 1.13.2.1 1.13.2.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri May 23 16:09:37 EDT 2008
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv22726/Modules
Modified Files:
Tag: CMake-2-6
CMakeDetermineASMCompiler.cmake CMakeDetermineCCompiler.cmake
CMakeDetermineCXXCompiler.cmake CMakeFortranCompilerId.F90.in
CMakeImportBuildSettings.cmake FindQt4.cmake
FindSubversion.cmake UseQt4.cmake
Added Files:
Tag: CMake-2-6
MacOSXBundleInfo.plist.in
Log Message:
ENH: push in changes from head
--- NEW FILE: MacOSXBundleInfo.plist.in ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key>
<string>${MACOSX_BUNDLE_INFO_STRING}</string>
<key>CFBundleIconFile</key>
<string>${MACOSX_BUNDLE_ICON_FILE}</string>
<key>CFBundleIdentifier</key>
<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
<key>CFBundleName</key>
<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
</dict>
</plist>
Index: CMakeDetermineCXXCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCXXCompiler.cmake,v
retrieving revision 1.45
retrieving revision 1.45.2.1
diff -C 2 -d -r1.45 -r1.45.2.1
*** CMakeDetermineCXXCompiler.cmake 25 Feb 2008 14:23:14 -0000 1.45
--- CMakeDetermineCXXCompiler.cmake 23 May 2008 20:09:34 -0000 1.45.2.1
***************
*** 92,100 ****
# e.g. powerpc-linux-g++, arm-elf-g++ or i586-mingw32msvc-g++
# the other tools of the toolchain usually have the same prefix
IF (NOT _CMAKE_TOOLCHAIN_PREFIX)
! GET_FILENAME_COMPONENT(COMPILER_BASENAME "${CMAKE_CXX_COMPILER}" NAME_WE)
! IF (COMPILER_BASENAME MATCHES "^(.+-)[gc]\\+\\+")
! STRING(REGEX REPLACE "^(.+-)[gc]\\+\\+" "\\1" _CMAKE_TOOLCHAIN_PREFIX "${COMPILER_BASENAME}")
! ENDIF (COMPILER_BASENAME MATCHES "^(.+-)[gc]\\+\\+")
ENDIF (NOT _CMAKE_TOOLCHAIN_PREFIX)
--- 92,103 ----
# e.g. powerpc-linux-g++, arm-elf-g++ or i586-mingw32msvc-g++
# the other tools of the toolchain usually have the same prefix
+ # NAME_WE cannot be used since then this test will fail for names lile
+ # "arm-unknown-nto-qnx6.3.0-gcc.exe", where BASENAME would be
+ # "arm-unknown-nto-qnx6" instead of the correct "arm-unknown-nto-qnx6.3.0-"
IF (NOT _CMAKE_TOOLCHAIN_PREFIX)
! GET_FILENAME_COMPONENT(COMPILER_BASENAME "${CMAKE_CXX_COMPILER}" NAME)
! IF (COMPILER_BASENAME MATCHES "^(.+-)[gc]\\+\\+(\\.exe)?$")
! STRING(REGEX REPLACE "^(.+-)[gc]\\+\\+(\\.exe)?$" "\\1" _CMAKE_TOOLCHAIN_PREFIX "${COMPILER_BASENAME}")
! ENDIF (COMPILER_BASENAME MATCHES "^(.+-)[gc]\\+\\+(\\.exe)?$")
ENDIF (NOT _CMAKE_TOOLCHAIN_PREFIX)
Index: UseQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UseQt4.cmake,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C 2 -d -r1.13.2.1 -r1.13.2.2
*** UseQt4.cmake 18 Mar 2008 14:23:52 -0000 1.13.2.1
--- UseQt4.cmake 23 May 2008 20:09:35 -0000 1.13.2.2
***************
*** 37,41 ****
ENDIF (QT_USE_QT3SUPPORT)
! # list dependent modules, so their modules are automatically on
SET(QT_QT3SUPPORT_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE)
SET(QT_QTSVG_MODULE_DEPENDS QTGUI QTXML QTCORE)
--- 37,41 ----
ENDIF (QT_USE_QT3SUPPORT)
! # list dependent modules, so dependent libraries are added
SET(QT_QT3SUPPORT_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE)
SET(QT_QTSVG_MODULE_DEPENDS QTGUI QTXML QTCORE)
***************
*** 51,55 ****
QTDBUS QTXML QTSQL QTXMLPATTERNS QTNETWORK QTCORE)
! IF (QT_USE_${module})
IF (QT_${module}_FOUND)
IF(QT_USE_${module})
--- 51,55 ----
QTDBUS QTXML QTSQL QTXMLPATTERNS QTNETWORK QTCORE)
! IF (QT_USE_${module} OR QT_USE_${module}_DEPENDS)
IF (QT_${module}_FOUND)
IF(QT_USE_${module})
***************
*** 60,69 ****
SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIBRARY} ${QT_${module}_LIB_DEPENDENCIES})
FOREACH(depend_module ${QT_${module}_MODULE_DEPENDS})
! SET(QT_USE_${depend_module} 1)
ENDFOREACH(depend_module ${QT_${module}_MODULE_DEPENDS})
ELSE (QT_${module}_FOUND)
MESSAGE("Qt ${module} library not found.")
ENDIF (QT_${module}_FOUND)
! ENDIF (QT_USE_${module})
ENDFOREACH(module)
--- 60,69 ----
SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIBRARY} ${QT_${module}_LIB_DEPENDENCIES})
FOREACH(depend_module ${QT_${module}_MODULE_DEPENDS})
! SET(QT_USE_${depend_module}_DEPENDS 1)
ENDFOREACH(depend_module ${QT_${module}_MODULE_DEPENDS})
ELSE (QT_${module}_FOUND)
MESSAGE("Qt ${module} library not found.")
ENDIF (QT_${module}_FOUND)
! ENDIF (QT_USE_${module} OR QT_USE_${module}_DEPENDS)
ENDFOREACH(module)
Index: CMakeImportBuildSettings.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeImportBuildSettings.cmake,v
retrieving revision 1.8.12.1
retrieving revision 1.8.12.2
diff -C 2 -d -r1.8.12.1 -r1.8.12.2
*** CMakeImportBuildSettings.cmake 30 Mar 2008 13:09:15 -0000 1.8.12.1
--- CMakeImportBuildSettings.cmake 23 May 2008 20:09:34 -0000 1.8.12.2
***************
*** 96,100 ****
# Build tool must match on Windows.
IF(WIN32)
! IF(CMAKE_BUILD_TOOL_MISMATCH)
MESSAGE(SEND_ERROR
"This project, ${PROJECT_NAME}, depends on the project "
--- 96,100 ----
# Build tool must match on Windows.
IF(WIN32)
! IF(CMAKE_BUILD_TOOL_MISMATCH AND NOT CMAKE_OVERRIDE_COMPILER_MISMATCH)
MESSAGE(SEND_ERROR
"This project, ${PROJECT_NAME}, depends on the project "
***************
*** 116,120 ****
"${CMAKE_BUILD_SETTING_PROJECT_NAME} with the correct "
"generator. ")
! ENDIF(CMAKE_BUILD_TOOL_MISMATCH)
ENDIF(WIN32)
--- 116,120 ----
"${CMAKE_BUILD_SETTING_PROJECT_NAME} with the correct "
"generator. ")
! ENDIF(CMAKE_BUILD_TOOL_MISMATCH AND NOT CMAKE_OVERRIDE_COMPILER_MISMATCH)
ENDIF(WIN32)
Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.96.2.9
retrieving revision 1.96.2.10
diff -C 2 -d -r1.96.2.9 -r1.96.2.10
*** FindQt4.cmake 15 May 2008 19:39:49 -0000 1.96.2.9
--- FindQt4.cmake 23 May 2008 20:09:34 -0000 1.96.2.10
***************
*** 268,271 ****
--- 268,272 ----
# macro for asking qmake to process pro files
MACRO(QT_QUERY_QMAKE outvar invar)
+ IF(QT_QMAKE_EXECUTABLE)
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake/tmp.pro
"message(CMAKE_MESSAGE<$$${invar}>)")
***************
*** 290,293 ****
--- 291,295 ----
ENDIF(_qmake_result)
+ ENDIF(QT_QMAKE_EXECUTABLE)
ENDMACRO(QT_QUERY_QMAKE)
***************
*** 456,459 ****
--- 458,462 ----
FIND_PATH(QT_QTCORE_INCLUDE_DIR QtGlobal
+ PATHS
${QT_HEADERS_DIR}/QtCore
${QT_LIBRARY_DIR}/QtCore.framework/Headers
***************
*** 761,764 ****
--- 764,775 ----
IF( NOT QT_QTCORE_LIBRARY_DEBUG AND NOT QT_QTCORE_LIBRARY_RELEASE )
+
+ # try dropping a hint if trying to use Visual Studio with Qt built by mingw
+ IF(QT_LIBRARY_DIR AND MSVC)
+ IF(EXISTS ${QT_LIBRARY_DIR}/libqtmain.a)
+ MESSAGE( FATAL_ERROR "It appears you're trying to use Visual Studio with Qt built by mingw")
+ ENDIF(EXISTS ${QT_LIBRARY_DIR}/libqtmain.a)
+ ENDIF(QT_LIBRARY_DIR AND MSVC)
+
IF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
MESSAGE( FATAL_ERROR "Could NOT find QtCore. Check ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log for more details.")
***************
*** 1306,1315 ****
# if the includes,libraries,moc,uic and rcc are found then we have it
! IF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
SET( QT4_FOUND "YES" )
INCLUDE(FindPackageMessage)
FIND_PACKAGE_MESSAGE(Qt4 "Found Qt-Version ${QTVERSION}"
"[${QT_LIBRARY_DIR}][${QT_INCLUDE_DIR}][${QT_MOC_EXECUTABLE}][${QT_UIC_EXECUTABLE}][${QT_RCC_EXECUTABLE}]")
! ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
SET( QT4_FOUND "NO")
SET(QT_QMAKE_EXECUTABLE "${QT_QMAKE_EXECUTABLE}-NOTFOUND" CACHE FILEPATH "Invalid qmake found" FORCE)
--- 1317,1328 ----
# if the includes,libraries,moc,uic and rcc are found then we have it
! IF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND
! QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE AND QT_QTCORE_LIBRARY)
SET( QT4_FOUND "YES" )
INCLUDE(FindPackageMessage)
FIND_PACKAGE_MESSAGE(Qt4 "Found Qt-Version ${QTVERSION}"
"[${QT_LIBRARY_DIR}][${QT_INCLUDE_DIR}][${QT_MOC_EXECUTABLE}][${QT_UIC_EXECUTABLE}][${QT_RCC_EXECUTABLE}]")
! ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND
! QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE AND QT_QTCORE_LIBRARY)
SET( QT4_FOUND "NO")
SET(QT_QMAKE_EXECUTABLE "${QT_QMAKE_EXECUTABLE}-NOTFOUND" CACHE FILEPATH "Invalid qmake found" FORCE)
***************
*** 1317,1321 ****
MESSAGE( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!")
ENDIF( Qt4_FIND_REQUIRED)
! ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
SET(QT_FOUND ${QT4_FOUND})
--- 1330,1336 ----
MESSAGE( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!")
ENDIF( Qt4_FIND_REQUIRED)
! ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND
! QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE AND QT_QTCORE_LIBRARY)
!
SET(QT_FOUND ${QT4_FOUND})
Index: FindSubversion.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSubversion.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** FindSubversion.cmake 26 Mar 2008 18:08:24 -0000 1.2.2.2
--- FindSubversion.cmake 23 May 2008 20:09:34 -0000 1.2.2.3
***************
*** 21,24 ****
--- 21,26 ----
# Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)
# MESSAGE("Current revision is ${Project_WC_REVISION}")
+ # Subversion_WC_LOG(${PROJECT_SOURCE_DIR} Project)
+ # MESSAGE("Last changed log is ${Project_LAST_CHANGED_LOG}")
# ENDIF(Subversion_FOUND)
***************
*** 53,61 ****
SET(Subversion_SVN_FOUND FALSE)
- # the subversion commands should be executed with the C locale, otherwise
- # the message (which are parsed) may be translated, Alex
- SET(_Subversion_SAVED_LC_ALL "$ENV{LC_ALL}" )
- SET(ENV{LC_ALL} C)
-
FIND_PROGRAM(Subversion_SVN_EXECUTABLE svn
DOC "subversion command line client")
--- 55,58 ----
***************
*** 67,70 ****
--- 64,72 ----
MACRO(Subversion_WC_INFO dir prefix)
+ # the subversion commands should be executed with the C locale, otherwise
+ # the message (which are parsed) may be translated, Alex
+ SET(_Subversion_SAVED_LC_ALL "$ENV{LC_ALL}")
+ SET(ENV{LC_ALL} C)
+
EXECUTE_PROCESS(COMMAND ${Subversion_SVN_EXECUTABLE} --version
WORKING_DIRECTORY ${dir}
***************
*** 97,103 ****
ENDIF(NOT ${Subversion_svn_info_result} EQUAL 0)
EXECUTE_PROCESS(COMMAND
${Subversion_SVN_EXECUTABLE} log -r BASE ${dir}
! OUTPUT_VARIABLE Subversion_LAST_CHANGED_LOG
ERROR_VARIABLE Subversion_svn_log_error
RESULT_VARIABLE Subversion_svn_log_result
--- 99,115 ----
ENDIF(NOT ${Subversion_svn_info_result} EQUAL 0)
+ # restore the previous LC_ALL
+ SET(ENV{LC_ALL} ${_Subversion_SAVED_LC_ALL})
+
+ ENDMACRO(Subversion_WC_INFO)
+
+ MACRO(Subversion_WC_LOG dir prefix)
+ # This macro can block if the certificate is not signed:
+ # svn ask you to accept the certificate and wait for your answer
+ # This macro requires a svn server network access (Internet most of the time)
+ # and can also be slow since it access the svn server
EXECUTE_PROCESS(COMMAND
${Subversion_SVN_EXECUTABLE} log -r BASE ${dir}
! OUTPUT_VARIABLE ${prefix}_LAST_CHANGED_LOG
ERROR_VARIABLE Subversion_svn_log_error
RESULT_VARIABLE Subversion_svn_log_result
***************
*** 107,117 ****
MESSAGE(SEND_ERROR "Command \"${Subversion_SVN_EXECUTABLE} log -r BASE ${dir}\" failed with output:\n${Subversion_svn_log_error}")
ENDIF(NOT ${Subversion_svn_log_result} EQUAL 0)
! ENDMACRO(Subversion_WC_INFO)
ENDIF(Subversion_SVN_EXECUTABLE)
- # restore the previous LC_ALL
- SET(ENV{LC_ALL} ${_Subversion_SAVED_LC_ALL})
-
IF(NOT Subversion_FOUND)
IF(NOT Subversion_FIND_QUIETLY)
--- 119,126 ----
MESSAGE(SEND_ERROR "Command \"${Subversion_SVN_EXECUTABLE} log -r BASE ${dir}\" failed with output:\n${Subversion_svn_log_error}")
ENDIF(NOT ${Subversion_svn_log_result} EQUAL 0)
! ENDMACRO(Subversion_WC_LOG)
ENDIF(Subversion_SVN_EXECUTABLE)
IF(NOT Subversion_FOUND)
IF(NOT Subversion_FIND_QUIETLY)
Index: CMakeDetermineASMCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineASMCompiler.cmake,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C 2 -d -r1.1.2.1 -r1.1.2.2
*** CMakeDetermineASMCompiler.cmake 23 Apr 2008 02:05:39 -0000 1.1.2.1
--- CMakeDetermineASMCompiler.cmake 23 May 2008 20:09:33 -0000 1.1.2.2
***************
*** 44,55 ****
ENDIF (NOT _CMAKE_TOOLCHAIN_LOCATION)
! # if we have a gcc cross compiler, they have usually some prefix, like
! # e.g. powerpc-linux-gcc, arm-elf-gcc or i586-mingw32msvc-gcc
! # the other tools of the toolchain usually have the same prefix
IF (NOT _CMAKE_TOOLCHAIN_PREFIX)
! GET_FILENAME_COMPONENT(COMPILER_BASENAME "${CMAKE_ASM${ASM_DIALECT}_COMPILER}" NAME_WE)
! IF (COMPILER_BASENAME MATCHES "^(.+-)g?as")
! STRING(REGEX REPLACE "^(.+-)g?as" "\\1" _CMAKE_TOOLCHAIN_PREFIX "${COMPILER_BASENAME}")
! ENDIF (COMPILER_BASENAME MATCHES "^(.+-)g?as")
ENDIF (NOT _CMAKE_TOOLCHAIN_PREFIX)
--- 44,58 ----
ENDIF (NOT _CMAKE_TOOLCHAIN_LOCATION)
! # If we have a gcc cross compiler, they have usually some prefix, like
! # e.g. powerpc-linux-gcc, arm-elf-gcc or i586-mingw32msvc-gcc .
! # The other tools of the toolchain usually have the same prefix
! # NAME_WE cannot be used since then this test will fail for names lile
! # "arm-unknown-nto-qnx6.3.0-gcc.exe", where BASENAME would be
! # "arm-unknown-nto-qnx6" instead of the correct "arm-unknown-nto-qnx6.3.0-"
IF (NOT _CMAKE_TOOLCHAIN_PREFIX)
! GET_FILENAME_COMPONENT(COMPILER_BASENAME "${CMAKE_ASM${ASM_DIALECT}_COMPILER}" NAME)
! IF (COMPILER_BASENAME MATCHES "^(.+-)g?as(\\.exe)?$")
! STRING(REGEX REPLACE "^(.+-)g?as(\\.exe)?$" "\\1" _CMAKE_TOOLCHAIN_PREFIX "${COMPILER_BASENAME}")
! ENDIF (COMPILER_BASENAME MATCHES "^(.+-)g?as(\\.exe)?$")
ENDIF (NOT _CMAKE_TOOLCHAIN_PREFIX)
Index: CMakeFortranCompilerId.F90.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranCompilerId.F90.in,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** CMakeFortranCompilerId.F90.in 25 Feb 2008 14:23:14 -0000 1.1
--- CMakeFortranCompilerId.F90.in 23 May 2008 20:09:34 -0000 1.1.2.1
***************
*** 9,12 ****
--- 9,14 ----
#elif defined(__IBM__) || defined(__IBMC__)
PRINT *, 'INFO:compiler[VisualAge]'
+ #elif defined(__PGI)
+ PRINT *, 'INFO:compiler[PGI]'
#elif defined(_COMPILER_VERSION)
PRINT *, 'INFO:compiler[MIPSpro]'
Index: CMakeDetermineCCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCCompiler.cmake,v
retrieving revision 1.52
retrieving revision 1.52.2.1
diff -C 2 -d -r1.52 -r1.52.2.1
*** CMakeDetermineCCompiler.cmake 25 Feb 2008 14:23:14 -0000 1.52
--- CMakeDetermineCCompiler.cmake 23 May 2008 20:09:33 -0000 1.52.2.1
***************
*** 89,100 ****
ENDIF (NOT _CMAKE_TOOLCHAIN_LOCATION)
! # if we have a gcc cross compiler, they have usually some prefix, like
! # e.g. powerpc-linux-gcc, arm-elf-gcc or i586-mingw32msvc-gcc
! # the other tools of the toolchain usually have the same prefix
IF (NOT _CMAKE_TOOLCHAIN_PREFIX)
! GET_FILENAME_COMPONENT(COMPILER_BASENAME "${CMAKE_C_COMPILER}" NAME_WE)
! IF (COMPILER_BASENAME MATCHES "^(.+-)g?cc")
! STRING(REGEX REPLACE "^(.+-)g?cc" "\\1" _CMAKE_TOOLCHAIN_PREFIX "${COMPILER_BASENAME}")
! ENDIF (COMPILER_BASENAME MATCHES "^(.+-)g?cc")
ENDIF (NOT _CMAKE_TOOLCHAIN_PREFIX)
--- 89,103 ----
ENDIF (NOT _CMAKE_TOOLCHAIN_LOCATION)
! # If we have a gcc cross compiler, they have usually some prefix, like
! # e.g. powerpc-linux-gcc, arm-elf-gcc or i586-mingw32msvc-gcc .
! # The other tools of the toolchain usually have the same prefix
! # NAME_WE cannot be used since then this test will fail for names lile
! # "arm-unknown-nto-qnx6.3.0-gcc.exe", where BASENAME would be
! # "arm-unknown-nto-qnx6" instead of the correct "arm-unknown-nto-qnx6.3.0-"
IF (NOT _CMAKE_TOOLCHAIN_PREFIX)
! GET_FILENAME_COMPONENT(COMPILER_BASENAME "${CMAKE_C_COMPILER}" NAME)
! IF (COMPILER_BASENAME MATCHES "^(.+-)g?cc(\\.exe)?$")
! STRING(REGEX REPLACE "^(.+-)g?cc(\\.exe)?$" "\\1" _CMAKE_TOOLCHAIN_PREFIX "${COMPILER_BASENAME}")
! ENDIF (COMPILER_BASENAME MATCHES "^(.+-)g?cc(\\.exe)?$")
ENDIF (NOT _CMAKE_TOOLCHAIN_PREFIX)
More information about the Cmake-commits
mailing list