[cmake-commits] alex committed cl.cmake 1.3 1.4

cmake-commits at cmake.org cmake-commits at cmake.org
Fri May 18 10:55:37 EDT 2007


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

Modified Files:
	cl.cmake 
Log Message:
COMP: if a new cmake runs on an old build tree, set CMAKE_LINKER to link to make it link

Alex


Index: cl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/cl.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cl.cmake	18 May 2007 14:32:22 -0000	1.3
+++ cl.cmake	18 May 2007 14:55:35 -0000	1.4
@@ -2,6 +2,14 @@
 SET(CMAKE_LINK_LIBRARY_FLAG "")
 SET(MSVC 1)
 
+# hack: if a new cmake (which uses CMAKE__LINKER) runs on an old build tree
+# (where link was hardcoded) and where CMAKE_LINKER isn't in the cache
+# and still cmake didn't fail in CMakeFindBinUtils.cmake (because it isn't rerun)
+# hardcode CMAKE_LINKER here to link, so it behaves as it did before, Alex
+IF(NOT DEFINED CMAKE_LINKER)
+   SET(CMAKE_LINKER link)
+ENDIF(NOT DEFINED CMAKE_LINKER)
+
 IF(CMAKE_VERBOSE_MAKEFILE)
   SET(CMAKE_CL_NOLOGO)
 ELSE(CMAKE_VERBOSE_MAKEFILE)



More information about the Cmake-commits mailing list