[Cmake-commits] [cmake-commits] hoffman committed Windows-icl.cmake 1.5 1.6 Windows-ifort.cmake 1.7 1.8

[cmake-commits at cmake.org]

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

Modified Files:
	Windows-icl.cmake Windows-ifort.cmake 
Log Message:
Add support for embeded manifests for Intel C/C++/Fortran compilers


Index: Windows-ifort.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-ifort.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** Windows-ifort.cmake	30 Apr 2008 15:33:54 -0000	1.7
--- Windows-ifort.cmake	1 Sep 2009 20:33:51 -0000	1.8
***************
*** 27,31 ****
  
  SET(CMAKE_Fortran_LINK_EXECUTABLE
!     "<CMAKE_Fortran_COMPILER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} <FLAGS> /Fe<TARGET> -link <CMAKE_Fortran_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
  
  SET(CMAKE_CREATE_WIN32_EXE /subsystem:windows)
--- 27,42 ----
  
  SET(CMAKE_Fortran_LINK_EXECUTABLE
!   "<CMAKE_Fortran_COMPILER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} <FLAGS> /Fe<TARGET> -link <CMAKE_Fortran_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
! 
! INCLUDE(Platform/Windows-Intel)
! 
! IF(_INTEL_COMPILER_SUPPORTS_MANIFEST)
!     SET(CMAKE_Fortran_LINK_EXECUTABLE
!       "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_Fortran_LINK_EXECUTABLE}")
!   SET(CMAKE_Fortran_CREATE_SHARED_LIBRARY
!     "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_Fortran_CREATE_SHARED_LIBRARY}")
!   SET(CMAKE_Fortran_CREATE_SHARED_MODULE
!     "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_Fortran_CREATE_SHARED_MODULE}")
! ENDIF(_INTEL_COMPILER_SUPPORTS_MANIFEST)
  
  SET(CMAKE_CREATE_WIN32_EXE /subsystem:windows)

Index: Windows-icl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-icl.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** Windows-icl.cmake	2 Sep 2008 18:47:41 -0000	1.5
--- Windows-icl.cmake	1 Sep 2009 20:33:50 -0000	1.6
***************
*** 41,45 ****
  
  SET(CMAKE_CXX_LINK_EXECUTABLE
!     "<CMAKE_CXX_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> <OBJECTS> /Fe<TARGET> -link <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
  
  SET(CMAKE_CREATE_WIN32_EXE /subsystem:windows)
--- 41,45 ----
  
  SET(CMAKE_CXX_LINK_EXECUTABLE
!   "<CMAKE_CXX_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> <OBJECTS> /Fe<TARGET> -link <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
  
  SET(CMAKE_CREATE_WIN32_EXE /subsystem:windows)
***************
*** 76,77 ****
--- 76,94 ----
  SET (CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT ${CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT})
  SET (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT})
+ 
+ INCLUDE(Platform/Windows-Intel)
+ 
+ IF(_INTEL_COMPILER_SUPPORTS_MANIFEST)
+   SET(CMAKE_C_LINK_EXECUTABLE
+     "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}")
+   SET(CMAKE_C_CREATE_SHARED_LIBRARY
+     "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_C_CREATE_SHARED_LIBRARY}")
+   SET(CMAKE_C_CREATE_SHARED_MODULE
+     "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_C_CREATE_SHARED_MODULE}")
+   SET(CMAKE_CXX_LINK_EXECUTABLE
+     "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_CXX_LINK_EXECUTABLE}")
+   SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
+     "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_LIBRARY}")
+   SET(CMAKE_CXX_CREATE_SHARED_MODULE
+     "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_MODULE}")
+ ENDIF(_INTEL_COMPILER_SUPPORTS_MANIFEST)