[Cmake-commits] [cmake-commits] king committed CMakeImportBuildSettings.cmake 1.10 1.11

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv20653/Modules

Modified Files:
	CMakeImportBuildSettings.cmake 
Log Message:
ENH: Extend previous patch from Mathieu Malaterre to apply override to the build tool also.


Index: CMakeImportBuildSettings.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeImportBuildSettings.cmake,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** CMakeImportBuildSettings.cmake	28 Mar 2008 18:07:13 -0000	1.10
--- CMakeImportBuildSettings.cmake	21 May 2008 18:02:40 -0000	1.11
***************
*** 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)