ENH: merge changes from main tree

6 files changed, 20 insertions, 103 deletions

diff --git a/Templates/CPack.GenericDescription.txt b/Templates/CPack.GenericDescription.txt
index 5942271625..9ca1802ad8 100644
--- a/Templates/CPack.GenericDescription.txt
+++ b/Templates/CPack.GenericDescription.txt
@@ -1,70 +1,5 @@
-COMPILING INSTRUCTIONS
-======================
+DESCRIPTION
+===========
 
-This project uses the CMake (http://www.cmake.org) cross-platform build system.
-To compile this project, you will have to make sure you have CMake installed.
-Binary and source distributions of CMake can be found at
-http://www.cmake.org/HTML/Download.html.  If it exists for your platform, we
-highly recommend using a binary distribution.
+This is an installer created using CPack (http://www.cmake.org). No additional installation instructions provided.
 
-Once CMake is installed, you are ready to build this project. We highly
-recommend reading the documentation on
-http://www.cmake.org/HTML/Documentation.html if you are not familiar with this
-process.
-
-Here is a summary of the build:
-
-* Run one of the CMake user interfaces.
-* Change configuration options.
-* Compile (make on UNIX, Visual Studio on Windows).
-
-UNIX/Linux
-----------
-
-The following instructions only apply to Unix/Linux systems.  
-
-The following example shows how to use this technique to build this project on
-multiple architectures. Assume we have a Solaris machine and an IRIX machine
-with a shared disk with the source tarball in the home directory.
-
-On either machine, extract the source tarball:
-
-  tar xvzf paraview-2.0.0.tar.gz
-
-On the Solaris machine, run
-
-  mkdir paraview-2.0.0-solaris<br>
-  cd paraview-2.0.0-solaris<br>
-  ccmake ../paraview-2.0.0<br>
-  make && make install
-
-Then on the IRIX machine, run
-
-  mkdir paraview-2.0.0-irix<br>
-  cd paraview-2.0.0-irix<br>
-  ccmake ../paraview-2.0.0<br>
-  make && make install
-
-It is a very good idea to tell CMake what C and C++ compilers you will be
-using. This can prevent many build problems.  On most systems you can pass this
-information to CMake in the following way:
-
-  env CXX=/your/C++/compiler CC=/your/c/compiler ccmake .
-
-otherwise you must set CXX and CC in your environment and then run ccmake (or
-cmake -i).
-
-Windows
--------
-
-The Windows build process uses the CMake GUI CMakeSetup.
-
-Execute CMakeSetup. This will pop-up a GUI that allows you to tailor the build.
-You'll have to tell CMakeSetup where you've placed your source code, and where
-to build the object code and dll's. The build directory is typically placed
-next to the source directory.
-
-When CMakeSetup completes you can build the project. If you are using Visual
-Studio, start up Visual Studio and load the project file.  Then select the
-ALL_BUILD project, and build it. If you are using NMake Makefiles, Borland
-Makefiles, Mingw, MSYS, or Cygwin, then use the appropriate make command.
diff --git a/Templates/CPack.GenericLicense.txt b/Templates/CPack.GenericLicense.txt
index 97dccdd016..c211bb3702 100644
--- a/Templates/CPack.GenericLicense.txt
+++ b/Templates/CPack.GenericLicense.txt
@@ -1,15 +1,5 @@
 LICENSE
 =======
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+This is an installer created using CPack (http://www.cmake.org). No license provided.
 
-For more information, please contact the vendor of this package.
diff --git a/Templates/CPack.GenericWelcome.txt b/Templates/CPack.GenericWelcome.txt
index 9dd40ff275..5330087b1e 100644
--- a/Templates/CPack.GenericWelcome.txt
+++ b/Templates/CPack.GenericWelcome.txt
@@ -1,2 +1 @@
-Welcome to installation. This program will guide you through the installation
-of this software.
+Welcome to installation. This program will guide you through the installation of this software.
diff --git a/Templates/DLLHeader.dsptemplate b/Templates/DLLHeader.dsptemplate
index 59cbeef9e4..7234a741df 100644
--- a/Templates/DLLHeader.dsptemplate
+++ b/Templates/DLLHeader.dsptemplate
@@ -71,7 +71,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 /nologo /dll /machine:I386

-# ADD LINK32 CM_OPTIMIZED_LIBRARIES CM_LIBRARIES  /nologo /dll /machine:I386 /out:"LIBRARY_OUTPUT_PATHRelease/OUTPUT_NAME_RELEASE"

+# ADD LINK32 /nologo /dll /machine:I386 /out:"LIBRARY_OUTPUT_PATHRelease/OUTPUT_NAME_RELEASE"

+CM_MULTILINE_OPTIONS_RELEASE

 

 CMAKE_CUSTOM_RULE_CODE

 

@@ -102,9 +103,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept

-CM_MULTILINE_DEBUG_LIBRARIES

-CM_MULTILINE_LIBRARIES_FOR_DEBUG

 # ADD LINK32 /nologo /dll /debug /machine:I386 /out:"LIBRARY_OUTPUT_PATHDebug/OUTPUT_NAME_DEBUG" /pdbtype:sept

+CM_MULTILINE_OPTIONS_DEBUG

 

 CMAKE_CUSTOM_RULE_CODE

 

@@ -137,7 +137,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32  /nologo /dll /machine:I386 

-# ADD LINK32 CM_OPTIMIZED_LIBRARIES CM_LIBRARIES  /nologo /dll /machine:I386 /out:"LIBRARY_OUTPUT_PATHMinSizeRel/OUTPUT_NAME_MINSIZEREL"

+# ADD LINK32 /nologo /dll /machine:I386 /out:"LIBRARY_OUTPUT_PATHMinSizeRel/OUTPUT_NAME_MINSIZEREL"

+CM_MULTILINE_OPTIONS_MINSIZEREL

 

 CMAKE_CUSTOM_RULE_CODE

 

@@ -168,7 +169,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 /nologo /dll /machine:I386 /pdbtype:sept

-# ADD LINK32 CM_OPTIMIZED_LIBRARIES CM_LIBRARIES /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"LIBRARY_OUTPUT_PATHRelWithDebInfo/OUTPUT_NAME_RELWITHDEBINFO"

+# ADD LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"LIBRARY_OUTPUT_PATHRelWithDebInfo/OUTPUT_NAME_RELWITHDEBINFO"

+CM_MULTILINE_OPTIONS_RELWITHDEBINFO

 

 CMAKE_CUSTOM_RULE_CODE

 

diff --git a/Templates/EXEHeader.dsptemplate b/Templates/EXEHeader.dsptemplate
index 203e8ec150..518ec28fe7 100644
--- a/Templates/EXEHeader.dsptemplate
+++ b/Templates/EXEHeader.dsptemplate
@@ -70,8 +70,7 @@ LINK32=link.exe
 # ADD BASE LINK32  /nologo /subsystem:console /machine:I386 /IGNORE:4089

 # ADD LINK32  /nologo /subsystem:console /machine:I386 /IGNORE:4089

 # ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelease\OUTPUT_NAME_RELEASE"

-CM_MULTILINE_OPTIMIZED_LIBRARIES

-CM_MULTILINE_LIBRARIES

+CM_MULTILINE_OPTIONS_RELEASE

 

 CMAKE_CUSTOM_RULE_CODE

 

@@ -103,8 +102,7 @@ LINK32=link.exe
 # ADD BASE LINK32  /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /IGNORE:4089

 # ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /IGNORE:4089

 # ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHDebug\OUTPUT_NAME_DEBUG"

-CM_MULTILINE_DEBUG_LIBRARIES

-CM_MULTILINE_LIBRARIES_FOR_DEBUG

+CM_MULTILINE_OPTIONS_DEBUG

 

 CMAKE_CUSTOM_RULE_CODE

 

@@ -133,8 +131,7 @@ LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089

 # ADD LINK32 /nologo /subsystem:console /machine:I386 /IGNORE:4089

 # ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHMinSizeRel\OUTPUT_NAME_MINSIZEREL"

-CM_MULTILINE_OPTIMIZED_LIBRARIES

-CM_MULTILINE_LIBRARIES

+CM_MULTILINE_OPTIONS_MINSIZEREL

 

 CMAKE_CUSTOM_RULE_CODE

 

@@ -164,8 +161,7 @@ LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /IGNORE:4089

 # ADD LINK32  /nologo /subsystem:console /debug /machine:I386 /IGNORE:4089

 # ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO"

-CM_MULTILINE_OPTIMIZED_LIBRARIES

-CM_MULTILINE_LIBRARIES

+CM_MULTILINE_OPTIONS_RELWITHDEBINFO

 

 CMAKE_CUSTOM_RULE_CODE

 

diff --git a/Templates/EXEWinHeader.dsptemplate b/Templates/EXEWinHeader.dsptemplate
index 8a7f7e0658..42cc35e39f 100644
--- a/Templates/EXEWinHeader.dsptemplate
+++ b/Templates/EXEWinHeader.dsptemplate
@@ -72,8 +72,7 @@ LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386  /IGNORE:4089

 # ADD LINK32  /nologo /subsystem:windows /machine:I386  /IGNORE:4089

 # ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelease\OUTPUT_NAME_RELEASE"

-CM_MULTILINE_OPTIMIZED_LIBRARIES

-CM_MULTILINE_LIBRARIES

+CM_MULTILINE_OPTIONS_RELEASE

 

 CMAKE_CUSTOM_RULE_CODE

 

@@ -105,9 +104,7 @@ LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089

 # ADD LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /IGNORE:4089

 # ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHDebug\OUTPUT_NAME_DEBUG"

-CM_MULTILINE_DEBUG_LIBRARIES

-CM_MULTILINE_LIBRARIES_FOR_DEBUG

-

+CM_MULTILINE_OPTIONS_DEBUG

 

 CMAKE_CUSTOM_RULE_CODE

 

@@ -136,8 +133,7 @@ LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 /pdbtype:sept /IGNORE:4089

 # ADD LINK32 /nologo /subsystem:windows  /machine:I386 /pdbtype:sept /IGNORE:4089

 # ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHMinSizeRel\OUTPUT_NAME_MINSIZEREL"

-CM_MULTILINE_OPTIMIZED_LIBRARIES

-CM_MULTILINE_LIBRARIES

+CM_MULTILINE_OPTIONS_MINSIZEREL

 

 CMAKE_CUSTOM_RULE_CODE

 

@@ -169,8 +165,7 @@ LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386  /IGNORE:4089

 # ADD LINK32 /nologo /subsystem:windows /debug /machine:I386  /IGNORE:4089

 # ADD LINK32 /out:"EXECUTABLE_OUTPUT_PATHRelWithDebInfo\OUTPUT_NAME_RELWITHDEBINFO"

-CM_MULTILINE_OPTIMIZED_LIBRARIES

-CM_MULTILINE_LIBRARIES

+CM_MULTILINE_OPTIONS_RELWITHDEBINFO

 

 CMAKE_CUSTOM_RULE_CODE