[Cmake-commits] [cmake-commits] hoffman committed Windows-cl.cmake 1.92 1.93

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Sep 1 14:33:28 EDT 2009


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

Modified Files:
	Windows-cl.cmake 
Log Message:
Move /MANIFEST flag into -E vs_link.  This is so it can be used by the intel compilers without having to specifiy it in the intel compiler files 


Index: Windows-cl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-cl.cmake,v
retrieving revision 1.92
retrieving revision 1.93
diff -C 2 -d -r1.92 -r1.93
*** Windows-cl.cmake	15 Jul 2009 16:43:09 -0000	1.92
--- Windows-cl.cmake	1 Sep 2009 18:33:26 -0000	1.93
***************
*** 200,204 ****
    SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG")
    SET (CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib ")
!   SET (CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT} /MANIFEST")
  ELSE(MSVC_VERSION GREATER 1310)
    IF(CMAKE_USING_VC_FREE_TOOLS)
--- 200,204 ----
    SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG")
    SET (CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib ")
!   SET (CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT}")
  ELSE(MSVC_VERSION GREATER 1310)
    IF(CMAKE_USING_VC_FREE_TOOLS)



More information about the Cmake-commits mailing list