[Cmake-commits] [cmake-commits] hoffman committed DLLHeader.dsptemplate 1.27 1.27.6.1 EXEHeader.dsptemplate 1.23 1.23.6.1 EXEWinHeader.dsptemplate 1.22 1.22.6.1

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Sep 12 10:56:23 EDT 2008


Update of /cvsroot/CMake/CMake/Templates
In directory public:/mounts/ram/cvs-serv22946/Templates

Modified Files:
      Tag: CMake-2-6
	DLLHeader.dsptemplate EXEHeader.dsptemplate 
	EXEWinHeader.dsptemplate 
Log Message:
ENH: 2.6.2 RC 4 merge into main tree


Index: EXEWinHeader.dsptemplate
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/EXEWinHeader.dsptemplate,v
retrieving revision 1.22
retrieving revision 1.22.6.1
diff -C 2 -d -r1.22 -r1.22.6.1
*** EXEWinHeader.dsptemplate	9 May 2007 12:25:45 -0000	1.22
--- EXEWinHeader.dsptemplate	12 Sep 2008 14:56:21 -0000	1.22.6.1
***************
*** 59,63 ****
  # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  # ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_RELEASE
--- 59,63 ----
  # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  # ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_RELEASE
***************
*** 91,95 ****
  # ADD BASE CPP  /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  # ADD CPP /nologo  /D "WIN32"  /D "_DEBUG" /D "_WINDOWS" /FD /GZ /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_DEBUG
--- 91,95 ----
  # ADD BASE CPP  /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  # ADD CPP /nologo  /D "WIN32"  /D "_DEBUG" /D "_WINDOWS" /FD /GZ /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_DEBUG
***************
*** 122,126 ****
  # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  # ADD CPP /nologo  /D "WIN32"  /D "NDEBUG" /D "_WINDOWS" /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL
--- 122,126 ----
  # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  # ADD CPP /nologo  /D "WIN32"  /D "NDEBUG" /D "_WINDOWS" /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL
***************
*** 152,156 ****
  # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  # ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO
--- 152,156 ----
  # ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  # ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

Index: DLLHeader.dsptemplate
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/DLLHeader.dsptemplate,v
retrieving revision 1.27
retrieving revision 1.27.6.1
diff -C 2 -d -r1.27 -r1.27.6.1
*** DLLHeader.dsptemplate	9 May 2007 12:25:45 -0000	1.27
--- DLLHeader.dsptemplate	12 Sep 2008 14:56:21 -0000	1.27.6.1
***************
*** 58,64 ****
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "OUTPUT_LIBNAME_EXPORTS" /FD /c
  # ADD CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL"  /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_RELEASE
--- 58,64 ----
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL" OUTPUT_LIBNAME_EXPORTS /FD /c
  # ADD CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL"  /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_RELEASE
***************
*** 90,96 ****
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OUTPUT_LIBNAME_EXPORTS" /FD /c
  # ADD CPP /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL"  /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_DEBUG
--- 90,96 ----
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" OUTPUT_LIBNAME_EXPORTS /FD /c
  # ADD CPP /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL"  /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES  OUTPUT_LIBNAME_EXPORTS
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_DEBUG
***************
*** 123,130 ****
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /D "WIN32"  /D "_WINDOWS" /D "_USRDLL" /FD /c
  # SUBTRACT BASE CPP /YX
  # ADD CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL"  /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL
--- 123,130 ----
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /D "WIN32"  /D "_WINDOWS" /D "_USRDLL" /FD /c  OUTPUT_LIBNAME_EXPORTS
  # SUBTRACT BASE CPP /YX
  # ADD CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL"  /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL
***************
*** 156,162 ****
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "OUTPUT_LIBNAME_EXPORTS" /FD /c
  # ADD CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL"  /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO
--- 156,162 ----
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL" OUTPUT_LIBNAME_EXPORTS /FD /c
  # ADD CPP /nologo /D "WIN32" /D "_WINDOWS" /D "_USRDLL"  /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES  OUTPUT_LIBNAME_EXPORTS
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

Index: EXEHeader.dsptemplate
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/EXEHeader.dsptemplate,v
retrieving revision 1.23
retrieving revision 1.23.6.1
diff -C 2 -d -r1.23 -r1.23.6.1
*** EXEHeader.dsptemplate	9 May 2007 12:25:45 -0000	1.23
--- EXEHeader.dsptemplate	12 Sep 2008 14:56:21 -0000	1.23.6.1
***************
*** 59,63 ****
  # ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
  # ADD CPP /nologo  /D "WIN32"  /D "NDEBUG" /D "_CONSOLE" /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_RELEASE
--- 59,63 ----
  # ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
  # ADD CPP /nologo  /D "WIN32"  /D "NDEBUG" /D "_CONSOLE" /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_RELEASE
***************
*** 89,93 ****
  # ADD BASE CPP   /D "WIN32" /D "_DEBUG" /D "_CONSOLE"  /FD /GZ /c
  # ADD CPP /nologo  /D "WIN32"  /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_DEBUG
--- 89,93 ----
  # ADD BASE CPP   /D "WIN32" /D "_DEBUG" /D "_CONSOLE"  /FD /GZ /c
  # ADD CPP /nologo  /D "WIN32"  /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_DEBUG
***************
*** 120,124 ****
  # ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
  # ADD CPP /nologo  /D "WIN32" BUILD_INCLUDES EXTRA_DEFINES /D "NDEBUG" /D "_CONSOLE"  /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL
--- 120,124 ----
  # ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
  # ADD CPP /nologo  /D "WIN32" BUILD_INCLUDES EXTRA_DEFINES /D "NDEBUG" /D "_CONSOLE"  /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL
***************
*** 150,154 ****
  # ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
  # ADD CPP /nologo  /D "WIN32"  /D "NDEBUG" /D "_CONSOLE" /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO
--- 150,154 ----
  # ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
  # ADD CPP /nologo  /D "WIN32"  /D "NDEBUG" /D "_CONSOLE" /FD /c
! # ADD CPP BUILD_INCLUDES EXTRA_DEFINES OUTPUT_LIBNAME_EXPORTS
  # ADD CPP CMAKE_CXX_FLAGS
  # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO



More information about the Cmake-commits mailing list