[cmake-commits] alex committed CMakeFindBinUtils.cmake 1.5 1.6

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeFindBinUtils.cmake 
Log Message:

BUG: with MS Visual Studio currently there is no compiler id, so check the
generator too

Alex


Index: CMakeFindBinUtils.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFindBinUtils.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CMakeFindBinUtils.cmake	21 May 2007 14:15:42 -0000	1.5
+++ CMakeFindBinUtils.cmake	2 Jul 2007 16:46:55 -0000	1.6
@@ -18,7 +18,10 @@
 
 
 # if it's the MS C/CXX compiler, search for link
-IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC" OR "${CMAKE_C_COMPILER_ID}" MATCHES "MSVC")
+IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC" 
+   OR "${CMAKE_C_COMPILER_ID}" MATCHES "MSVC"
+   OR "${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+
   FIND_PROGRAM(CMAKE_LINKER NAMES link PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
   FIND_PROGRAM(CMAKE_LINKER NAMES link)
 
@@ -29,7 +32,9 @@
   MARK_AS_ADVANCED(CMAKE_LINKER)
 
 # in all other cases search for ar, ranlib, etc.
-ELSE("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC" OR "${CMAKE_C_COMPILER_ID}" MATCHES "MSVC")
+ELSE("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC" 
+   OR "${CMAKE_C_COMPILER_ID}" MATCHES "MSVC"
+   OR "${CMAKE_GENERATOR}" MATCHES "Visual Studio")
 
   FIND_PROGRAM(CMAKE_AR NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ar PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
   FIND_PROGRAM(CMAKE_AR NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ar)
@@ -47,7 +52,9 @@
   FIND_PROGRAM(CMAKE_LINKER NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ld)
 
   MARK_AS_ADVANCED(CMAKE_AR CMAKE_RANLIB CMAKE_STRIP CMAKE_LINKER)
-ENDIF("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC" OR "${CMAKE_C_COMPILER_ID}" MATCHES "MSVC")
+ENDIF("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC" 
+   OR "${CMAKE_C_COMPILER_ID}" MATCHES "MSVC"
+   OR "${CMAKE_GENERATOR}" MATCHES "Visual Studio")
 
 
 # on Apple there really should be install_name_tool