--- cmake-2.6.2.orig/debian/cmake.menu +++ cmake-2.6.2/debian/cmake.menu @@ -0,0 +1,4 @@ +?package(cmake):needs="text" \ + section="Applications/Programming"\ + title="ccmake" command="/usr/bin/ccmake"\ + icon="/usr/share/pixmaps/cmake.xpm" --- cmake-2.6.2.orig/debian/compat +++ cmake-2.6.2/debian/compat @@ -0,0 +1 @@ +6 --- cmake-2.6.2.orig/debian/cmake.xpm +++ cmake-2.6.2/debian/cmake.xpm @@ -0,0 +1,44 @@ +/* XPM */ +static char *cmake[] = { +/* columns rows colors chars-per-pixel */ +"32 30 8 1", +" c #000000", +"r c #FF0000", +"g c #007f00", +"b c #0000FF", +"X c #007F7F", +"+ c #7F7F00", +"& c #B2B2B2", +"- c None", +/* pixels */ +"---------------&&---------------", +"---------------b&---------------", +"--------------&br&--------------", +"-------------&bbr&--------------", +"-------------&bbrr&-------------", +"-------------bbbrr&-------------", +"------------&bbbrrr&------------", +"-----------&bbbbrrr&------------", +"-----------&bbbbrrrr------------", +"-----------bbbbbrrrr&-----------", +"----------&bbbbbrrrrr&----------", +"----------bbbbbbbrrrrr----------", +"---------&bbbbbbbrrrrr&---------", +"---------bbbbbbbbrrrrrr---------", +"--------&bbbbbbbbrrrrrr&--------", +"-------&bbbbbbbbbbrrrrr&--------", +"-------&bbbbbbbbbbrrrrrr&-------", +"-------bbbbbbbbb&rrrrrrr&-------", +"------&bbbbbbb&&&&rrrrrrr&------", +"-----&&bbbbbb&&&&&rrrrrrrr------", +"----&&bbbbb&&&&&&&rrrrrrrr&-----", +"----&bbbbbX&&&&&&&&rrrrrrrr-----", +"----&bbbbXg&&&&&&&&rrrrrrrr&----", +"---&bbbXgggggg&&&&&&rrrrrrrr----", +"---&bbXXggggggggg&&&rrrrrrrr&---", +"--&bbXggggggggggggg&rrrrrrrrr---", +"--&bXgggggggggggggggg+rrrrrrr&--", +"-&bXgggggggggggggggggggg++rrrr--", +"-bXggggggggggggggggggggggg++rr&&", +"&gggggggggggggggggggggggggggg+r-" +}; --- cmake-2.6.2.orig/debian/cmake.emacsen-remove +++ cmake-2.6.2/debian/cmake.emacsen-remove @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +FLAVOR=$1 +PACKAGE=cmake +ELCFILE=cmake-mode.elc + +if [ ${FLAVOR} != emacs ]; then + echo remove/${PACKAGE}: Purging byte-compiled files for ${FLAVOR} + rm -f /usr/share/${FLAVOR}/site-lisp/${ELCFILE} +fi --- cmake-2.6.2.orig/debian/dirs +++ cmake-2.6.2/debian/dirs @@ -0,0 +1,5 @@ +usr/bin +usr/share/doc/cmake +usr/share/man/man1 +usr/share/pixmaps +usr/share/emacs/site-lisp --- cmake-2.6.2.orig/debian/cmake.emacsen-install +++ cmake-2.6.2/debian/cmake.emacsen-install @@ -0,0 +1,25 @@ +#!/bin/sh +# +# emacsen install script for the Debian GNU/Linux cmake package + +FLAVOR=$1 +PACKAGE=cmake + +ELDIR=/usr/share/emacs/site-lisp/ +ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} +ELFILE="cmake-mode.el" +FLAGS="-batch -no-site-file -l path.el -f batch-byte-compile" + +if [ ${FLAVOR} != emacs ]; then + echo install/${PACKAGE}: Byte-compiling for ${FLAVOR} + + install -m 755 -d ${ELCDIR} + cd ${ELDIR} + cp ${ELFILE} ${ELCDIR} + cd ${ELCDIR} + cat << EOF > path.el +(setq load-path (cons "." load-path) byte-compile-warnings nil) +EOF + ${FLAVOR} ${FLAGS} ${ELFILE} + rm -f ${ELFILE} path.el +fi --- cmake-2.6.2.orig/debian/docs +++ cmake-2.6.2/debian/docs @@ -0,0 +1,4 @@ +CMakeLists.txt +ChangeLog.manual +ChangeLog.txt +CMakeLogo.gif --- cmake-2.6.2.orig/debian/control +++ cmake-2.6.2/debian/control @@ -0,0 +1,42 @@ +Source: cmake +Section: devel +Priority: optional +Maintainer: Kubuntu Developers +XSBC-Original-Maintainer: A. Maitland Bottoms +Uploaders: Pierre Habouzit , Modestas Vainius +DM-Upload-Allowed: yes +Build-Depends: debhelper (>= 6.0.7~), libncurses5-dev, tcl8.4, quilt, libcurl4-gnutls-dev, libqt4-dev +Standards-Version: 3.8.0 + +Package: cmake +Architecture: any +Depends: ${shlibs:Depends} +Description: A cross-platform, open-source make system + CMake is used to control the software compilation process using + simple platform and compiler independent configuration files. CMake + generates native makefiles and workspaces that can be used in the + compiler environment of your choice. CMake is quite sophisticated: it + is possible to support complex environments requiring system + configuration, pre-processor generation, code generation, and template + instantiation. + . + CMake was developed by Kitware as part of the NLM Insight + Segmentation and Registration Toolkit project. The ASCI VIEWS project + also provided support in the context of their parallel computation + environment. Other sponsors include the Insight, VTK, and VXL open + source software communities. + +Package: cmake-gui +Architecture: any +Depends: cmake, ${shlibs:Depends} +Replaces: cmake (<< 2.6.0-4ubuntu2) +Description: GUI for cmake cross-platform make system + CMake is used to control the software compilation process using + simple platform and compiler independent configuration files. CMake + generates native makefiles and workspaces that can be used in the + compiler environment of your choice. CMake is quite sophisticated: it + is possible to support complex environments requiring system + configuration, pre-processor generation, code generation, and template + instantiation. + . + This package provides a simple GUI to guide you through running cmake. --- cmake-2.6.2.orig/debian/cmake.emacsen-startup +++ cmake-2.6.2/debian/cmake.emacsen-startup @@ -0,0 +1,10 @@ +;; -*-emacs-lisp-*- +;; +;; Emacs startup file for the Debian GNU/Linux cmake package + +(autoload 'cmake-mode "cmake-mode") + +(setq auto-mode-alist + (append '(("CMakeLists\\.txt\\'" . cmake-mode) + ("\\.cmake\\'" . cmake-mode)) + auto-mode-alist)) --- cmake-2.6.2.orig/debian/copyright +++ cmake-2.6.2/debian/copyright @@ -0,0 +1,55 @@ +This package was debianized by Maitland Bottoms on +Wed, 28 Nov 2001 08:45:22 -0500. + +It was downloaded from http://www.cmake.org/ + +CMake was initially developed by Kitware with the following sponsorship: + + * National Library of Medicine at the National Institutes of Health + as part of the Insight Segmentation and Registration Toolkit (ITK). + + * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel + Visualization Initiative. + + * National Alliance for Medical Image Computing (NAMIC) is funded by the + National Institutes of Health through the NIH Roadmap for Medical Research, + Grant U54 EB005149. + + * Kitware, Inc. + +The CMake copyright is as follows: + +Copyright (c) 2002 Kitware, Inc., Insight Consortium +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * The names of Kitware, Inc., the Insight Consortium, or the names of + any consortium members, or of any contributors, may not be used to + endorse or promote products derived from this software without + specific prior written permission. + + * Modified source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + +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. + +See also the CMake web site: http://www.cmake.org for more information. --- cmake-2.6.2.orig/debian/cmake.lintian-overrides +++ cmake-2.6.2/debian/cmake.lintian-overrides @@ -0,0 +1,2 @@ +# this file is a template, not a real license +cmake: extra-license-file usr/share/cmake-2.6/Templates/CPack.GenericLicense.txt --- cmake-2.6.2.orig/debian/doxygen.config +++ cmake-2.6.2/debian/doxygen.config @@ -0,0 +1,698 @@ +# Doxyfile 1.1.4-20000625 + +# This file describes the settings to be used by doxygen for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# General configuration options +#--------------------------------------------------------------------------- + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = CMake + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = 2.4.4 + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = debian/Doxygen + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Dutch, French, Italian, Czech, Swedish, German, Finnish, Japanese, +# Spanish and Russian + +OUTPUT_LANGUAGE = English + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = YES + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSESS tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these class will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = NO + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. + +STRIP_FROM_PATH = + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a class diagram (in Html and LaTeX) for classes with base or +# super classes. Setting the tag to NO turns the diagrams off. + +CLASS_DIAGRAMS = YES + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. + +SOURCE_BROWSER = YES + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the CASE_SENSE_NAMES tag is set to NO (the default) then Doxygen +# will only generate file names in lower case letters. If set to +# YES upper case letters are also allowed. This is useful if you have +# classes or files whose names only differ in case and if your file system +# supports case sensitive file names. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the JAVADOC_AUTOBRIEF tag is set to YES (the default) then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the Javadoc-style will +# behave just like the Qt-style comments. + +JAVADOC_AUTOBRIEF = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# reimplements. + +INHERIT_DOCS = YES + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 8 + +# The ENABLE_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. + +WARN_FORMAT = "$file:$line: $text" + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +#INPUT = "d:\Insight\CMake\Source" +INPUT = . + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +FILE_PATTERNS = *.h *.txx *.cxx + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = debian + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. + +EXCLUDE_PATTERNS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. + +INPUT_FILTER = + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = YES + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 3 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet + +HTML_STYLESHEET = + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = YES + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = NO + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# For now this is experimental and is disabled by default. The RTF output +# is optimised for Word 97 and may not look too pretty with other readers +# or editors. + +GENERATE_RTF = YES + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using a WORD or other. +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = YES + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. + +MACRO_EXPANSION = YES + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = NO + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. + +PREDEFINED = "itkNotUsed(x)="\ + "itkSetMacro(name,type)= \ + virtual void Set##name (type _arg);" \ + "itkGetMacro(name,type)= \ + virtual type Get##name ();" \ + "itkGetConstMacro(name,type)= \ + virtual type Get##name () const;" \ + "itkSetStringMacro(name)= \ + virtual void Set##name (const char* _arg);" \ + "itkGetStringMacro(name)= \ + virtual const char* Get##name () const;" \ + "itkSetClampMacro(name,type,min,max)= \ + virtual void Set##name (type _arg);" \ + "itkSetObjectMacro(name,type)= \ + virtual void Set##name (type* _arg);" \ + "itkGetObjectMacro(name,type)= \ + virtual type* Get##name ();" \ + "itkBooleanMacro(name)= \ + virtual void name##On (); \ + virtual void name##Off ();" \ + "itkSetVector2Macro(name,type)= \ + virtual void Set##name (type _arg1, type _arg2) \ + virtual void Set##name (type _arg[2]);" \ + "itkGetVector2Macro(name,type)= \ + virtual type* Get##name () const; \ + virtual void Get##name (type& _arg1, type& _arg2) const; \ + virtual void Get##name (type _arg[2]) const;" \ + "itkSetVector3Macro(name,type)= \ + virtual void Set##name (type _arg1, type _arg2, type _arg3) \ + virtual void Set##name (type _arg[3]);" \ + "itkGetVector3Macro(name,type)= \ + virtual type* Get##name () const; \ + virtual void Get##name (type& _arg1, type& _arg2, type& _arg3) const; \ + virtual void Get##name (type _arg[3]) const;" \ + "itkSetVector4Macro(name,type)= \ + virtual void Set##name (type _arg1, type _arg2, type _arg3, type _arg4) \ + virtual void Set##name (type _arg[4]);" \ + "itkGetVector4Macro(name,type)= \ + virtual type* Get##name () const; \ + virtual void Get##name (type& _arg1, type& _arg2, type& _arg3, type& _arg4) const; \ + virtual void Get##name (type _arg[4]) const;" \ + "itkSetVector6Macro(name,type)= \ + virtual void Set##name (type _arg1, type _arg2, type _arg3, type _arg4, type _arg5, type _arg6) \ + virtual void Set##name (type _arg[6]);" \ + "itkGetVector6Macro(name,type)= \ + virtual type* Get##name () const; \ + virtual void Get##name (type& _arg1, type& _arg2, type& _arg3, type& _arg4, type& _arg5, type& _arg6) const; \ + virtual void Get##name (type _arg[6]) const;" \ + "itkSetVectorMacro(name,type,count)= \ + virtual void Set##name(type data[]);" \ + "itkGetVectorMacro(name,type,count)= \ + virtual type* Get##name () const;" \ + "itkNewMacro(type)= \ + static Pointer New();" \ + "itkTypeMacro(thisClass,superclass)= \ + virtual const char *GetClassName() const;" \ + "ITK_NUMERIC_LIMITS= \ + std::numeric_limits" + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED tag. + +EXPAND_ONLY_PREDEF = YES + +#--------------------------------------------------------------------------- +# Configuration::addtions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES tag can be used to specify one or more tagfiles. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = YES + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the ENABLE_PREPROCESSING, INCLUDE_GRAPH, and HAVE_DOT tags are set to +# YES then doxygen will generate a graph for each documented file showing +# the direct and indirect include dependencies of the file with other +# documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, INCLUDED_BY_GRAPH, and HAVE_DOT tags are set to +# YES then doxygen will generate a graph for each documented header file showing +# the documented files that directly or indirectly include this file + +INCLUDED_BY_GRAPH = YES + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found on the path. + +DOT_PATH = + +# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width +# (in pixels) of the graphs generated by dot. If a graph becomes larger than +# this value, doxygen will try to truncate the graph, so that it fits within +# the specified constraint. Beware that most browsers cannot cope with very +# large images. + +MAX_DOT_GRAPH_WIDTH = 1024 + +# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height +# (in pixels) of the graphs generated by dot. If a graph becomes larger than +# this value, doxygen will try to truncate the graph, so that it fits within +# the specified constraint. Beware that most browsers cannot cope with very +# large images. + +MAX_DOT_GRAPH_HEIGHT = 1024 + +#--------------------------------------------------------------------------- +# Configuration::addtions related to the search engine +#--------------------------------------------------------------------------- + +# The SEARCHENGINE tag specifies whether or not a search engine should be +# used. If set to NO the values of all tags below this one will be ignored. + +SEARCHENGINE = NO + +# The CGI_NAME tag should be the name of the CGI script that +# starts the search engine (doxysearch) with the correct parameters. +# A script with this name will be generated by doxygen. + +CGI_NAME = search.cgi + +# The CGI_URL tag should be the absolute URL to the directory where the +# cgi binaries are located. See the documentation of your http daemon for +# details. + +CGI_URL = + +# The DOC_URL tag should be the absolute URL to the directory where the +# documentation is located. If left blank the absolute path to the +# documentation, with file:// prepended to it, will be used. + +DOC_URL = + +# The DOC_ABSPATH tag should be the absolute path to the directory where the +# documentation is located. If left blank the directory on the local machine +# will be used. + +DOC_ABSPATH = + +# The BIN_ABSPATH tag must point to the directory where the doxysearch binary +# is installed. + +BIN_ABSPATH = /usr/local/bin/ + +# The EXT_DOC_PATHS tag can be used to specify one or more paths to +# documentation generated for other projects. This allows doxysearch to search +# the documentation for these projects as well. + +EXT_DOC_PATHS = --- cmake-2.6.2.orig/debian/changelog +++ cmake-2.6.2/debian/changelog @@ -0,0 +1,553 @@ +cmake (2.6.2-1ubuntu1.1) jaunty-security; urgency=low + + * SECURITY UPDATE: fix DoS via malformed XML + - debian/patches/CVE_2009_3720.patch: xmltok_impl.c to not access beyond + end of input string + - CVE-2009-3720 + * SECURITY UPDATE: fix DoS via malformed UTF-8 sequences + - debian/patches/CVE_2009_3560.patch: update xmlparse.c to properly + recognize the end of a token + - CVE-2009-3560 + + -- Jamie Strandboge Tue, 13 Apr 2010 20:49:21 -0500 + +cmake (2.6.2-1ubuntu1) jaunty; urgency=low + + * Merge with Debian, remaining change: + - Add --qt-gui to bootstrap arguments in debian/rules, + build-dep on libqt4-dev, builds cmake-gui + + -- Jonathan Riddell Wed, 05 Nov 2008 12:19:46 +0000 + +cmake (2.6.2-1) experimental; urgency=low + + * New upstream release. + * New co-maintainer: + - add myself to Uploaders. + - add DM-Upload-Allowed: yes to debian/control. + * Refresh patches: + - FindQt4.cmake2.6.diff + - do-not-use-lib64.diff + * Add patches from upstream CVS: + - relative_path_fixes.diff - fixes a couple of major bugs in Makefile + generation when CMAKE_USE_RELATIVE_PATHS is ON. This brings + CMAKE_USE_RELATIVE_PATHS=ON to a very usable state. + - manpage-generation-fixes.diff - fixes a few manual page generation + issues. This resolves all lintian warnings and info tags related + to the cmake manual pages. + * Bump Standards-Version to 3.8.0: + - add README.source which directs the reader to quilt README.source. + * Use dh_lintian: + - rename cmake.lintian to cmake.lintian-overrides; + - bump debhelper compat level to 6; + - build depend on debhelper (>= 6.0.7~). + * Fix path in the lintian override so it is effective again. + * Make cmake.menu conform to the current Debian Menu System standard. + * Drop unused old manual pages from debian/. They are provided by upstream + now. + * Add debian/watch. + + -- Modestas Vainius Mon, 13 Oct 2008 19:24:49 +0300 + +cmake (2.6.0-5) unstable; urgency=medium + + * Fix build-deps: libncursesw5-dev doesn't work, just use the non wide one. + This will build ccmake again (Closes: #481392). + + -- Pierre Habouzit Tue, 29 Jul 2008 11:05:17 +0200 + +cmake (2.6.0-4ubuntu2) intrepid; urgency=low + + * Move cmake desktop and icon file to cmake-gui package (Closes LP: #258036) + + -- Alexander Saltykov Wed, 20 Aug 2008 18:34:00 +0600 + +cmake (2.6.0-4ubuntu1) intrepid; urgency=low + + * Add libncurses5-dev build-dep, makes it build ccmake + * Add --qt-gui to bootstrap arguments in debian/rules, build-dep on libqt4-dev, builds cmake-gui + + -- Jonathan Riddell Tue, 22 Jul 2008 23:21:53 +0100 + +cmake (2.6.0-4) unstable; urgency=low + + * Really remove dependency on emacsen-common (Closes: #471975). + + -- Pierre Habouzit Wed, 14 May 2008 21:01:42 +0200 + +cmake (2.6.0-3) unstable; urgency=low + + * Remove dependency on emacsen-common (Closes: #471975): + emacs guys, I was asked in a previous bug (#427763) to byte-compile the + cmake extension, the policy mandates a dependency upon emacs which is + silly, and depending upon emacsen-common breaks the whole thing. A + pre-depends would be insane, WHY ON EARTH is the emacs policy so horribly + broken ? Until someone answers that, cmake will stay in the previous state + with byte-compilation, and without any emacs dependency. + + * Add patches/reinstate-arm.diff to fix FTBFS on arm platforms + (Closes: #481016) + + -- Pierre Habouzit Tue, 13 May 2008 10:18:12 +0200 + +cmake (2.6.0-2) unstable; urgency=low + + * Upload to unstable this time. + * Depend upon emacsen-common (Closes: #471975). + + -- Pierre Habouzit Mon, 12 May 2008 18:13:33 +0200 + +cmake (2.6.0-1) experimental; urgency=low + + * Update patches/FindQt4.cmake2.6.diff (Closes: #479907). + * Add patches/executables-dont-need-fpic.diff (Closes: #478404). + * Bump Standards-Version to 3.7.3. + + -- Pierre Habouzit Mon, 12 May 2008 17:11:04 +0200 + +cmake (2.6.0~rc8-1.1) experimental; urgency=low + + * Non-maintainer upload with permission from DadCoder. + Happy Prague visit. + * Fix FindQt4.cmake (Closes: #477110) + + -- Sune Vuorela Sun, 20 Apr 2008 22:58:33 +0200 + +cmake (2.6.0~rc8-1) experimental; urgency=low + + * New upstream rc release. + * Update patches: + + drop findmpeg2-robustness.diff. + + drop hurd-SA_SIGINFO.diff. + + drop nsis-support.diff. + + -- Pierre Habouzit Fri, 18 Apr 2008 20:49:30 +0200 + +cmake (2.4.8-1) unstable; urgency=low + + [ Pierre Habouzit ] + * New upstream release (Closes: 462335). + * remove patches/hurd-Platform.diff, merged upstream. + + [ Rafael Laboissiere ] + * debian/rules, debian/cmake.emacsen-{startup,install,remove}: Allow + byte-compilation of cmake-mode.el at install time and put in the + emacsen startup directory just the necessary initialization code + of cmake-mode (Closes: 427763) + + -- Pierre Habouzit Fri, 25 Jan 2008 10:19:47 +0100 + +cmake (2.4.7-1) unstable; urgency=low + + * New upstream release. + * Drop patches/findqt4-binaries-order.diff (Closes: #433105). + + -- Pierre Habouzit Thu, 19 Jul 2007 18:58:37 +0200 + +cmake (2.4.6-1) unstable; urgency=low + + * Upload to unstable. + * Make FindMPEG2.cmake more robust (Closes: 419134). + + -- Pierre Habouzit Mon, 18 Jun 2007 10:24:58 +0100 + +cmake (2.4.6-0) experimental; urgency=low + + * New upstream release (experimental upload, 2.4.5 must propagate): + + Ruby NAMES now includes ruby1.8 (Closes: 407481). + + * Add patch to support NSIS on linux properly, + thanks to Michal Čihař (Closes: 408846). + + -- Pierre Habouzit Wed, 13 Jun 2007 12:39:42 +0200 + +cmake (2.4.5-2) unstable; urgency=low + + * Add myself to Uploaders. + * Ack my NMU (Closes: 419007, 407155, 407304). + * Move to quilt, split diff.gz into patches, to avoid losing them. + + * debian/rules: + + add quilt snipplets. + + remove commented dh_ calls. + + remove old cruft, make it shorter. + + Avoid subshells, use makeism's rather than shell if/then/else. + + * Lintian warnings: + + use debian/compat rather than DH_COMPAT. + + add an override for the extra-license-file that in fact is a template. + + -- Pierre Habouzit Thu, 07 Jun 2007 11:09:46 +0200 + +cmake (2.4.5-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Disable lib64 paths in FindLibrary, as it's not needed in debian and + yields incorrect results (Closes: #419007). + * Apply Hurd Porter patch to deal with undefined SA_SIGINFO + (Closes: #407304). + * Reintroduce lost GNU.cmake (Closes: #407155). + + -- Pierre Habouzit Tue, 05 Jun 2007 13:28:35 +0200 + +cmake (2.4.5-1) unstable; urgency=low + + * New upstream bugfix release (Closes: #401071) + Fix for seg fault when a macro runs a bad command BUG# 3815 + Fix fix for foo.dll.lib that does not break -L/usr/lib in link names + Fix problem with LIBRARY_OUTPUT_PATH and linking to a dll foo.dll.lib instead of foo.lib + Do not depend on optimized libraries for a debug build and visa versa. + Fix target name matching custom command output conflict. + Fix FindQt3 so that it does not find qt4 + Fix FindKDE4 so that it only looks for kde4-config + + -- A. Maitland Bottoms Mon, 4 Dec 2006 16:29:44 -0500 + +cmake (2.4.4-1) unstable; urgency=low + + * New upstream release + * Upstream fixes parsing bug (Closes: #392624) + + -- A. Maitland Bottoms Sat, 25 Nov 2006 19:49:38 -0500 + +cmake (2.4.3-3) unstable; urgency=low + + * Have FindMPEG2 look in paths used in Debian (Closes: #391831) + * Make FindQt4 more reliable (Closes: #392473) + + -- A. Maitland Bottoms Fri, 10 Nov 2006 11:27:35 -0500 + +cmake (2.4.3-2) unstable; urgency=low + + * Remove recommends line (Closes: #392013, #392044) + + -- A. Maitland Bottoms Tue, 10 Oct 2006 21:33:40 -0400 + +cmake (2.4.3-1) unstable; urgency=low + + * New upstream release + * recognize .F90 as a fortran source extension (Closes: #376587) + * don't install cmake .vim files (Closes: #366663) + * don't depend upon emacs, let dh_installemacsen handle it (Closes: #378998) + + -- A. Maitland Bottoms Sat, 5 Aug 2006 17:06:11 -0400 + +cmake (2.4.2-1) unstable; urgency=low + + * New upstream release (Closes: #338324) + * Put cmake .vim files into /usr/share/vim/addons/plugin/ + where they can be used. (Closes: #366663) + * Install cmake-mode.el so it can be used. (Closes: #366664) + * Ensure cmake FindKDE locates KDE libraries on Debian + based distributions. + + -- A. Maitland Bottoms Sun, 18 Jun 2006 16:34:11 -0400 + +cmake (2.2.3-1) unstable; urgency=low + + * New upstream release (Closes: #338324) + * support GNU/kFreeBSD in cmake (Closes: #340764) + + -- A. Maitland Bottoms Sun, 8 Jan 2006 10:48:14 -0500 + +cmake (2.0.6-2) unstable; urgency=low + + * Apply upstream patch to fix UseSWIG.cmake (Closes: #330581) + + -- A. Maitland Bottoms Wed, 28 Sep 2005 15:29:19 -0400 + +cmake (2.0.6-1) unstable; urgency=low + + * New upstream release + * g++ 4.0 Transition + + -- A. Maitland Bottoms Sun, 11 Sep 2005 14:51:36 -0400 + +cmake (2.0.5-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Wed, 2 Mar 2005 09:22:44 -0500 + +cmake (2.0.3-1) unstable; urgency=low + + * New upstream release + * finds QT's moc, gets bug closing syntax right (Closes: #250000) + + -- A. Maitland Bottoms Thu, 12 Aug 2004 09:21:32 -0400 + +cmake (2.0.2-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Wed, 23 Jun 2004 13:51:38 -0400 + +cmake (2.0.1-1) unstable; urgency=low + + * New upstream release with soname and soversion support + * find QT's moc (Closes: 250000) + + -- A. Maitland Bottoms Mon, 7 Jun 2004 22:08:50 -0400 + +cmake (1.8.2.1-1) unstable; urgency=low + + * From CVS to pick up soname and soversion support + + -- A. Maitland Bottoms Wed, 26 Nov 2003 21:46:54 -0500 + +cmake (1.8.1-1) unstable; urgency=low + + * New upstream release + * Add Gavin Baker's Take II on adding versioning support for shared libraries + + -- A. Maitland Bottoms Sun, 9 Nov 2003 09:43:02 -0500 + +cmake (1.6.7-2) unstable; urgency=low + + * Add Gavin Baker's Take II on adding versioning support for shared libraries + + -- A. Maitland Bottoms Mon, 23 Jun 2003 13:39:03 -0400 + +cmake (1.6.7-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Mon, 23 Jun 2003 13:06:46 -0400 + +cmake (1.6.5-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Mon, 24 Feb 2003 11:25:58 -0500 + +cmake (1.6.4-1) unstable; urgency=low + + * New upstream release, move up to tcl8.4 + + -- A. Maitland Bottoms Fri, 14 Feb 2003 16:06:12 -0500 + +cmake (1.4.7-1) unstable; urgency=low + + * New upstream release + * Build without dart-client network submission (Closes: #175579) + + -- A. Maitland Bottoms Mon, 06 Jan 2003 19:02:36 -0500 + +cmake (1.4.6-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Thu, 24 Oct 2002 21:19:47 -0400 + +cmake (1.4.5-2) unstable; urgency=low + + * Don't put man page in /usr/man (Closes: #163901) + + -- A. Maitland Bottoms Thu, 17 Oct 2002 17:43:22 -0400 + +cmake (1.4.5-1) unstable; urgency=low + + * New upstream version. + + -- A. Maitland Bottoms Fri, 20 Sep 2002 23:33:49 -0400 + +cmake (1.4.3-3) unstable; urgency=low + + * Build with Dart, build in separate Build directory to make cleanup easier + * New upstream man page + * CMakeSetup no longer exists upstream, Debian menu now refers to ccmake + + -- A. Maitland Bottoms Tue, 6 Aug 2002 19:05:05 -0400 + +cmake (1.4.3-2) unstable; urgency=low + + * Oh no, not again. + * Use -ffunction-sections on parisc64 (closes: #155366) + + -- A. Maitland Bottoms Sat, 3 Aug 2002 21:45:37 -0400 + +cmake (1.4.3-1) unstable; urgency=low + + * New upstream. (Closes: #155296) + + -- A. Maitland Bottoms Sat, 3 Aug 2002 00:02:18 -0400 + +cmake (1.2-2) unstable; urgency=low + + * Use -ffunction-sections on parisc64 (closes: #133696) + + -- Maitland Bottoms Thu, 14 Feb 2002 18:36:25 +0000 + +cmake (1.2-1) unstable; urgency=low + + * New upstream. + + -- A. Maitland Bottoms Thu, 9 Jan 2002 17:20:12 -0500 + +cmake (1.0-1) unstable; urgency=low + + * Newer upstream. (Need to keep up with VTK 4 build needs) + * Patched support for DESTDIR in install targets + * Patched option to disable use of -rpath using CMAKE_SKIP_RPATH + * include cmake-mode.el + + -- A. Maitland Bottoms Thu, 9 Jan 2002 17:20:12 -0500 + +cmake (0.98-1) unstable; urgency=low + + * Newer upstream, includes curses interface: ccmake + * Patched to support make install DESTDIR=foo + + -- A. Maitland Bottoms Mon, 17 Dec 2001 19:54:32 -0500 + +cmake (0.96-1) unstable; urgency=low + + * Initial Release. + (Closes: #121610) + + -- A. Maitland Bottoms Wed, 28 Nov 2001 08:45:22 -0500 + + +cmake (2.0.5-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Wed, 2 Mar 2005 09:22:44 -0500 + +cmake (2.0.3-1) unstable; urgency=low + + * New upstream release + * finds QT's moc, gets bug closing syntax right (Closes: #250000) + + -- A. Maitland Bottoms Thu, 12 Aug 2004 09:21:32 -0400 + +cmake (2.0.2-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Wed, 23 Jun 2004 13:51:38 -0400 + +cmake (2.0.1-1) unstable; urgency=low + + * New upstream release with soname and soversion support + * find QT's moc (Closes: 250000) + + -- A. Maitland Bottoms Mon, 7 Jun 2004 22:08:50 -0400 + +cmake (1.8.2.1-1) unstable; urgency=low + + * From CVS to pick up soname and soversion support + + -- A. Maitland Bottoms Wed, 26 Nov 2003 21:46:54 -0500 + +cmake (1.8.1-1) unstable; urgency=low + + * New upstream release + * Add Gavin Baker's Take II on adding versioning support for shared libraries + + -- A. Maitland Bottoms Sun, 9 Nov 2003 09:43:02 -0500 + +cmake (1.6.7-2) unstable; urgency=low + + * Add Gavin Baker's Take II on adding versioning support for shared libraries + + -- A. Maitland Bottoms Mon, 23 Jun 2003 13:39:03 -0400 + +cmake (1.6.7-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Mon, 23 Jun 2003 13:06:46 -0400 + +cmake (1.6.5-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Mon, 24 Feb 2003 11:25:58 -0500 + +cmake (1.6.4-1) unstable; urgency=low + + * New upstream release, move up to tcl8.4 + + -- A. Maitland Bottoms Fri, 14 Feb 2003 16:06:12 -0500 + +cmake (1.4.7-1) unstable; urgency=low + + * New upstream release + * Build without dart-client network submission (Closes: #175579) + + -- A. Maitland Bottoms Mon, 06 Jan 2003 19:02:36 -0500 + +cmake (1.4.6-1) unstable; urgency=low + + * New upstream release + + -- A. Maitland Bottoms Thu, 24 Oct 2002 21:19:47 -0400 + +cmake (1.4.5-2) unstable; urgency=low + + * Don't put man page in /usr/man (Closes: #163901) + + -- A. Maitland Bottoms Thu, 17 Oct 2002 17:43:22 -0400 + +cmake (1.4.5-1) unstable; urgency=low + + * New upstream version. + + -- A. Maitland Bottoms Fri, 20 Sep 2002 23:33:49 -0400 + +cmake (1.4.3-3) unstable; urgency=low + + * Build with Dart, build in separate Build directory to make cleanup easier + * New upstream man page + * CMakeSetup no longer exists upstream, Debian menu now refers to ccmake + + -- A. Maitland Bottoms Tue, 6 Aug 2002 19:05:05 -0400 + +cmake (1.4.3-2) unstable; urgency=low + + * Oh no, not again. + * Use -ffunction-sections on parisc64 (closes: #155366) + + -- A. Maitland Bottoms Sat, 3 Aug 2002 21:45:37 -0400 + +cmake (1.4.3-1) unstable; urgency=low + + * New upstream. (Closes: #155296) + + -- A. Maitland Bottoms Sat, 3 Aug 2002 00:02:18 -0400 + +cmake (1.2-2) unstable; urgency=low + + * Use -ffunction-sections on parisc64 (closes: #133696) + + -- Maitland Bottoms Thu, 14 Feb 2002 18:36:25 +0000 + +cmake (1.2-1) unstable; urgency=low + + * New upstream. + + -- A. Maitland Bottoms Thu, 9 Jan 2002 17:20:12 -0500 + +cmake (1.0-1) unstable; urgency=low + + * Newer upstream. (Need to keep up with VTK 4 build needs) + * Patched support for DESTDIR in install targets + * Patched option to disable use of -rpath using CMAKE_SKIP_RPATH + * include cmake-mode.el + + -- A. Maitland Bottoms Thu, 9 Jan 2002 17:20:12 -0500 + +cmake (0.98-1) unstable; urgency=low + + * Newer upstream, includes curses interface: ccmake + * Patched to support make install DESTDIR=foo + + -- A. Maitland Bottoms Mon, 17 Dec 2001 19:54:32 -0500 + +cmake (0.96-1) unstable; urgency=low + + * Initial Release. + (Closes: #121610) + + -- A. Maitland Bottoms Wed, 28 Nov 2001 08:45:22 -0500 --- cmake-2.6.2.orig/debian/watch +++ cmake-2.6.2/debian/watch @@ -0,0 +1,5 @@ +version=3 + +# Track CMake 2.6.x releases including RCs +opts="uversionmangle=s/-RC-(\d+)/~rc$1/i" \ + http://www.cmake.org/files/v2.6/cmake-([\d.]+(?:-RC-\d+)?).tar.gz --- cmake-2.6.2.orig/debian/rules +++ cmake-2.6.2/debian/rules @@ -0,0 +1,106 @@ +#!/usr/bin/make -f + +# The next line will cause Dart to be used if it is installed... +#USE_DARTP:=$(shell if [ -d /usr/share/Dart ]; then echo true; fi ) +USE_DARTP:= + +DARCH := $(shell dpkg --print-installation-architecture) +CFLAGS := -Wall -g $(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),-O0,-O2) +QUILT_CALL := QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null + + +# Hack for parisc64 to close bug #133696 +ifeq ($(shell arch),parisc64) +CFLAGS += -ffunction-sections +endif + +patch: patch-stamp +patch-stamp: + $(QUILT_CALL) push -a || test $$? = 2 + touch $@ + +unpatch: + $(QUILT_CALL) pop -a -R || test $$? = 2 + +configure: configure-stamp +configure-stamp: + dh_testdir + # pre-load the cache to avoid setting rpath: + rm -rf Build && mkdir -p Build + echo CMAKE_SKIP_RPATH:BOOL=YES >> Build/CMakeCache.txt + #echo TARGET_VERSION:STRING= >> Build/CMakeCache.txt + #echo TARGET_SOVERSION:STRING= >> Build/CMakeCache.txt + #echo BUILD_DOCUMENTATION:BOOL=ON >> Build/CMakeCache.txt + #echo BUILD_DOXYGEN:BOOL=ON >> Build/CMakeCache.txt + #echo BUILD_WXDialog:BOOL=ON >> Build/CMakeCache.txt + echo VERBOSE_BUILD:BOOL=ON >> Build/CMakeCache.txt + echo CMAKE_C_FLAGS:STRING=$(CFLAGS) >> Build/CMakeCache.txt + echo CMAKE_CXX_FLAGS:STRING=$(CFLAGS) >> Build/CMakeCache.txt + $(if $(USE_DARTP),echo DART_ROOT:PATH=/usr/share/Dart >> Build/CMakeCache.txt) + $(if $(USE_DARTP),echo BUILDNAME:STRING=cmake_2.2.3-1_$(DARCH).deb >> Build/CMakeCache.txt) + cd Build && ../bootstrap --prefix=/usr --docdir=/share/doc/cmake --mandir=/share/man --qt-gui + chmod -x ChangeLog.manual + chmod -x Modules/*.cmake Modules/*.cmake.in Modules/*.cxx Modules/Platform/* + touch $@ + +build: patch-stamp configure-stamp build-stamp +build-stamp: + dh_testdir + cd Build && $(MAKE) $(if $(USE_DARTP),Experimental && $(MAKE) ExperimentalSubmit) + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + rm -rf .pc build-stamp configure-stamp patch-stamp + rm -rf Build + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + # Add here commands to install the package into debian/cmake. + cd Build && $(MAKE) DESTDIR=$(CURDIR)/debian/cmake install + install -D -m 644 debian/cmake.xpm debian/cmake/usr/share/pixmaps/cmake.xpm + dh_lintian + #cp Docs/cmake-indent.vim debian/cmake/usr/share/vim/addons/indent/cmake.vim + #cp Docs/cmake-syntax.vim debian/cmake/usr/share/vim/addons/syntax/cmake.vim + cp Docs/cmake-mode.el debian/cmake/usr/share/emacs/site-lisp/ + + #Quick hack for cmake-gui, jriddell + mkdir -p debian/cmake-gui/usr/bin/ + mv debian/cmake/usr/bin/cmake-gui debian/cmake-gui/usr/bin/ + # fix cmake icon and menu installation + mkdir -p debian/cmake-gui/usr/share/pixmaps + mv debian/cmake/usr/share/applications debian/cmake-gui/usr/share/ + mv debian/cmake/usr/share/pixmaps/CMakeSetup.png debian/cmake-gui/usr/share/pixmaps/ + +# Build architecture-independent files here. +binary-indep: build install + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples + dh_installmenu + dh_installemacsen + dh_installcron + dh_installman + dh_installinfo + dh_installchangelogs ChangeLog.txt ChangeLog.manual + dh_link + dh_strip + dh_compress -XCMake.pdf + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch --- cmake-2.6.2.orig/debian/README.source +++ cmake-2.6.2/debian/README.source @@ -0,0 +1,6 @@ +This package uses quilt for upstream source code patch management. Please read +/usr/share/doc/quilt/README.source for more information how to apply, unapply, +add, modify or remove patches. + +Please note that /usr/share/doc/quilt/README.source is only available in quilt +version 0.46-4.1 or later. --- cmake-2.6.2.orig/debian/README.Debian +++ cmake-2.6.2/debian/README.Debian @@ -0,0 +1,11 @@ +cmake for Debian +---------------- + +Gavin Baker noticed the documentation file CMake.pdf is way out of date with +respect to CMake.rtf. + -- A. Maitland Bottoms , Mon Jun 23 17:20:14 2003 + +Tracking tagged releases from the cvs at kitware. +http://public.kitware.com/CMake/HTML/Download.html + + -- A. Maitland Bottoms , Wed, 28 Nov 2001 08:45:22 -0500 --- cmake-2.6.2.orig/debian/patches/CVE_2009_3560.patch +++ cmake-2.6.2/debian/patches/CVE_2009_3560.patch @@ -0,0 +1,19 @@ +Description: DoS via XML document with malformed UTF-8 sequences + (CVE_2009_3560) +Origin: http://expat.cvs.sourceforge.net/viewvc/expat/expat/lib/xmlparse.c?r1=1.164&r2=1.166 + http://expat.cvs.sourceforge.net/viewvc/expat/expat/lib/xmlparse.c?view=log#rev1.166 + http://expat.cvs.sourceforge.net/viewvc/expat/expat/lib/xmlparse.c?view=log#rev1.165 + +diff -Nur cmake-2.6.2/Utilities/cmexpat/xmlparse.c cmake-2.6.2.new/Utilities/cmexpat/xmlparse.c +--- cmake-2.6.2/Utilities/cmexpat/xmlparse.c 2008-09-24 13:34:41.000000000 -0500 ++++ cmake-2.6.2.new/Utilities/cmexpat/xmlparse.c 2010-04-13 20:48:13.273410763 -0500 +@@ -2547,6 +2547,9 @@ + return XML_ERROR_UNCLOSED_TOKEN; + case XML_TOK_PARTIAL_CHAR: + return XML_ERROR_PARTIAL_CHAR; ++ case -XML_TOK_PROLOG_S: ++ tok = -tok; ++ break; + case XML_TOK_NONE: + #ifdef XML_DTD + if (enc != encoding) --- cmake-2.6.2.orig/debian/patches/findmpeg2-addpath.diff +++ cmake-2.6.2/debian/patches/findmpeg2-addpath.diff @@ -0,0 +1,12 @@ +--- cmake-2.6.0.orig/Modules/FindMPEG2.cmake ++++ cmake-2.6.0/Modules/FindMPEG2.cmake +@@ -8,6 +8,9 @@ + # MPEG2_vo_LIBRARY, where to find the vo library. + + FIND_PATH(MPEG2_INCLUDE_DIR mpeg2.h ++ /usr/include/mpeg2dec ++ /usr/local/include ++ /usr/include + /usr/local/livid + ) + --- cmake-2.6.2.orig/debian/patches/FindQt4.cmake2.6.diff +++ cmake-2.6.2/debian/patches/FindQt4.cmake2.6.diff @@ -0,0 +1,212 @@ +--- a/Modules/FindQt4.cmake ++++ b/Modules/FindQt4.cmake +@@ -1408,198 +1408,6 @@ + QT_QUERY_QMAKE(QMAKE_LIBS_OPENGL "QMAKE_LIBS_OPENGL") + SET (QT_QTOPENGL_LIB_DEPENDENCIES ${QT_QTOPENGL_LIB_DEPENDENCIES} ${QMAKE_LIBS_OPENGL}) + +- ## system png +- IF(QT_QCONFIG MATCHES "system-png") +- FIND_LIBRARY(QT_PNG_LIBRARY NAMES png) +- MARK_AS_ADVANCED(QT_PNG_LIBRARY) +- IF(QT_PNG_LIBRARY) +- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_PNG_LIBRARY}) +- ENDIF(QT_PNG_LIBRARY) +- ENDIF(QT_QCONFIG MATCHES "system-png") +- +- # for X11, get X11 library directory +- IF(Q_WS_X11) +- QT_QUERY_QMAKE(QMAKE_LIBDIR_X11 "QMAKE_LIBDIR_X11") +- ENDIF(Q_WS_X11) +- +- ## X11 SM +- IF(QT_QCONFIG MATCHES "x11sm") +- # ask qmake where the x11 libs are +- FIND_LIBRARY(QT_X11_SM_LIBRARY NAMES SM PATHS ${QMAKE_LIBDIR_X11}) +- FIND_LIBRARY(QT_X11_ICE_LIBRARY NAMES ICE PATHS ${QMAKE_LIBDIR_X11}) +- MARK_AS_ADVANCED(QT_X11_SM_LIBRARY) +- MARK_AS_ADVANCED(QT_X11_ICE_LIBRARY) +- IF(QT_X11_SM_LIBRARY AND QT_X11_ICE_LIBRARY) +- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_X11_SM_LIBRARY} ${QT_X11_ICE_LIBRARY}) +- ENDIF(QT_X11_SM_LIBRARY AND QT_X11_ICE_LIBRARY) +- ENDIF(QT_QCONFIG MATCHES "x11sm") +- +- ## Xi +- IF(QT_QCONFIG MATCHES "tablet") +- FIND_LIBRARY(QT_XI_LIBRARY NAMES Xi PATHS ${QMAKE_LIBDIR_X11}) +- MARK_AS_ADVANCED(QT_XI_LIBRARY) +- IF(QT_XI_LIBRARY) +- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XI_LIBRARY}) +- ENDIF(QT_XI_LIBRARY) +- ENDIF(QT_QCONFIG MATCHES "tablet") +- +- ## Xrender +- IF(QT_QCONFIG MATCHES "xrender") +- FIND_LIBRARY(QT_XRENDER_LIBRARY NAMES Xrender PATHS ${QMAKE_LIBDIR_X11}) +- MARK_AS_ADVANCED(QT_XRENDER_LIBRARY) +- IF(QT_XRENDER_LIBRARY) +- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XRENDER_LIBRARY}) +- ENDIF(QT_XRENDER_LIBRARY) +- ENDIF(QT_QCONFIG MATCHES "xrender") +- +- ## Xrandr +- IF(QT_QCONFIG MATCHES "xrandr") +- FIND_LIBRARY(QT_XRANDR_LIBRARY NAMES Xrandr PATHS ${QMAKE_LIBDIR_X11}) +- MARK_AS_ADVANCED(QT_XRANDR_LIBRARY) +- IF(QT_XRANDR_LIBRARY) +- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XRANDR_LIBRARY}) +- ENDIF(QT_XRANDR_LIBRARY) +- ENDIF(QT_QCONFIG MATCHES "xrandr") +- +- ## Xcursor +- IF(QT_QCONFIG MATCHES "xcursor") +- FIND_LIBRARY(QT_XCURSOR_LIBRARY NAMES Xcursor PATHS ${QMAKE_LIBDIR_X11}) +- MARK_AS_ADVANCED(QT_XCURSOR_LIBRARY) +- IF(QT_XCURSOR_LIBRARY) +- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XCURSOR_LIBRARY}) +- ENDIF(QT_XCURSOR_LIBRARY) +- ENDIF(QT_QCONFIG MATCHES "xcursor") +- +- ## Xinerama +- IF(QT_QCONFIG MATCHES "xinerama") +- FIND_LIBRARY(QT_XINERAMA_LIBRARY NAMES Xinerama PATHS ${QMAKE_LIBDIR_X11}) +- MARK_AS_ADVANCED(QT_XINERAMA_LIBRARY) +- IF(QT_XINERAMA_LIBRARY) +- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XINERAMA_LIBRARY}) +- ENDIF(QT_XINERAMA_LIBRARY) +- ENDIF(QT_QCONFIG MATCHES "xinerama") +- +- ## Xfixes +- IF(QT_QCONFIG MATCHES "xfixes") +- FIND_LIBRARY(QT_XFIXES_LIBRARY NAMES Xfixes PATHS ${QMAKE_LIBDIR_X11}) +- MARK_AS_ADVANCED(QT_XFIXES_LIBRARY) +- IF(QT_XFIXES_LIBRARY) +- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XFIXES_LIBRARY}) +- ENDIF(QT_XFIXES_LIBRARY) +- ENDIF(QT_QCONFIG MATCHES "xfixes") +- +- ## system-freetype +- IF(QT_QCONFIG MATCHES "system-freetype") +- FIND_LIBRARY(QT_FREETYPE_LIBRARY NAMES freetype) +- MARK_AS_ADVANCED(QT_FREETYPE_LIBRARY) +- IF(QT_FREETYPE_LIBRARY) +- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_FREETYPE_LIBRARY}) +- ENDIF(QT_FREETYPE_LIBRARY) +- ENDIF(QT_QCONFIG MATCHES "system-freetype") +- +- ## fontconfig +- IF(QT_QCONFIG MATCHES "fontconfig") +- FIND_LIBRARY(QT_FONTCONFIG_LIBRARY NAMES fontconfig) +- MARK_AS_ADVANCED(QT_FONTCONFIG_LIBRARY) +- IF(QT_FONTCONFIG_LIBRARY) +- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_FONTCONFIG_LIBRARY}) +- ENDIF(QT_FONTCONFIG_LIBRARY) +- ENDIF(QT_QCONFIG MATCHES "fontconfig") +- +- ## system-zlib +- IF(QT_QCONFIG MATCHES "system-zlib") +- FIND_LIBRARY(QT_ZLIB_LIBRARY NAMES z) +- MARK_AS_ADVANCED(QT_ZLIB_LIBRARY) +- IF(QT_ZLIB_LIBRARY) +- SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_ZLIB_LIBRARY}) +- ENDIF(QT_ZLIB_LIBRARY) +- ENDIF(QT_QCONFIG MATCHES "system-zlib") +- +- ## openssl +- IF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN) +- FIND_PACKAGE(OpenSSL) +- IF(OPENSSL_LIBRARIES) +- SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES}) +- ENDIF(OPENSSL_LIBRARIES) +- ENDIF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN) +- +- ## qdbus +- IF(QT_QCONFIG MATCHES "qdbus") +- +- # if the dbus library isn't found, we'll assume its not required to build +- # shared Qt on Linux doesn't require it +- IF(NOT QT_DBUS_LIBRARY) +- EXECUTE_PROCESS(COMMAND pkg-config --libs-only-L dbus-1 +- OUTPUT_VARIABLE _dbus_query_output +- RESULT_VARIABLE _dbus_result +- ERROR_VARIABLE _dbus_query_output ) +- +- IF(_dbus_result MATCHES 0) +- STRING(REPLACE "-L" "" _dbus_query_output "${_dbus_query_output}") +- SEPARATE_ARGUMENTS(_dbus_query_output) +- ELSE(_dbus_result MATCHES 0) +- SET(_dbus_query_output) +- ENDIF(_dbus_result MATCHES 0) +- +- FIND_LIBRARY(QT_DBUS_LIBRARY NAMES dbus-1 PATHS ${_dbus_query_output} ) +- +- IF(QT_DBUS_LIBRARY) +- SET(QT_QTDBUS_LIB_DEPENDENCIES ${QT_QTDBUS_LIB_DEPENDENCIES} ${QT_DBUS_LIBRARY}) +- ENDIF(QT_DBUS_LIBRARY) +- +- MARK_AS_ADVANCED(QT_DBUS_LIBRARY) +- ENDIF(NOT QT_DBUS_LIBRARY) +- +- ENDIF(QT_QCONFIG MATCHES "qdbus") +- +- ## glib +- IF(QT_QCONFIG MATCHES "glib") +- +- # if the glib libraries aren't found, we'll assume its not required to build +- # shared Qt on Linux doesn't require it +- +- # Qt 4.2.0+ uses glib-2.0 +- IF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY) +- EXECUTE_PROCESS(COMMAND pkg-config --libs-only-L glib-2.0 gthread-2.0 +- OUTPUT_VARIABLE _glib_query_output +- RESULT_VARIABLE _glib_result +- ERROR_VARIABLE _glib_query_output ) +- +- IF(_glib_result MATCHES 0) +- STRING(REPLACE "-L" "" _glib_query_output "${_glib_query_output}") +- SEPARATE_ARGUMENTS(_glib_query_output) +- ELSE(_glib_result MATCHES 0) +- SET(_glib_query_output) +- ENDIF(_glib_result MATCHES 0) +- +- FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0 PATHS ${_glib_query_output} ) +- FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0 PATHS ${_glib_query_output} ) +- +- IF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY) +- SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} +- ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY}) +- ENDIF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY) +- +- MARK_AS_ADVANCED(QT_GLIB_LIBRARY) +- MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY) +- ENDIF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY) +- ENDIF(QT_QCONFIG MATCHES "glib") +- +- ## clock-monotonic, just see if we need to link with rt +- IF(QT_QCONFIG MATCHES "clock-monotonic") +- SET(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES}) +- SET(CMAKE_REQUIRED_LIBRARIES rt) +- CHECK_SYMBOL_EXISTS(_POSIX_TIMERS "unistd.h;time.h" QT_POSIX_TIMERS) +- SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAVE}) +- IF(QT_POSIX_TIMERS) +- FIND_LIBRARY(QT_RT_LIBRARY NAMES rt) +- MARK_AS_ADVANCED(QT_RT_LIBRARY) +- IF(QT_RT_LIBRARY) +- SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_RT_LIBRARY}) +- ENDIF(QT_RT_LIBRARY) +- ENDIF(QT_POSIX_TIMERS) +- ENDIF(QT_QCONFIG MATCHES "clock-monotonic") +- + IF(Q_WS_X11) + # X11 libraries Qt absolutely depends on + QT_QUERY_QMAKE(QT_LIBS_X11 "QMAKE_LIBS_X11") +@@ -1608,9 +1416,9 @@ + STRING(REGEX REPLACE "-l" "" QT_X11_LIB "${QT_X11_LIB}") + SET(QT_TMP_STR "QT_X11_${QT_X11_LIB}_LIBRARY") + FIND_LIBRARY(${QT_TMP_STR} NAMES "${QT_X11_LIB}" PATHS ${QMAKE_LIBDIR_X11}) +- MARK_AS_ADVANCED(${QT_TMP_STR}) + IF(${QT_TMP_STR}) + SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${${QT_TMP_STR}}) ++ MARK_AS_ADVANCED(${QT_TMP_STR}) + ENDIF(${QT_TMP_STR}) + ENDFOREACH(QT_X11_LIB) + --- cmake-2.6.2.orig/debian/patches/reinstate-arm.diff +++ cmake-2.6.2/debian/patches/reinstate-arm.diff @@ -0,0 +1,17 @@ +--- cmake-2.6.0.orig/Source/kwsys/CPU.h.in ++++ cmake-2.6.0/Source/kwsys/CPU.h.in +@@ -28,6 +28,14 @@ + #elif defined(__BIG_ENDIAN__) + # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG + ++/* Arm */ ++#elif defined(__arm__) ++# if !defined(__ARMEB__) ++# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_LITTLE ++# else ++# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG ++# endif ++ + /* Alpha */ + #elif defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA) + # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_LITTLE --- cmake-2.6.2.orig/debian/patches/CVE_2009_3720.patch +++ cmake-2.6.2/debian/patches/CVE_2009_3720.patch @@ -0,0 +1,15 @@ +Description: DoS via malformed XML (CVE-2009-3720) +Origin: http://expat.cvs.sourceforge.net/viewvc/expat/expat/lib/xmltok_impl.c?r1=1.15&r2=1.13 + +diff -Nur cmake-2.6.2/Utilities/cmexpat/xmltok_impl.c cmake-2.6.2.new/Utilities/cmexpat/xmltok_impl.c +--- cmake-2.6.2/Utilities/cmexpat/xmltok_impl.c 2008-09-24 13:34:41.000000000 -0500 ++++ cmake-2.6.2.new/Utilities/cmexpat/xmltok_impl.c 2010-04-13 20:47:23.433410937 -0500 +@@ -1738,7 +1738,7 @@ + const char *end, + POSITION *pos) + { +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + #define LEAD_CASE(n) \ + case BT_LEAD ## n: \ --- cmake-2.6.2.orig/debian/patches/relative_path_fixes2.diff +++ cmake-2.6.2/debian/patches/relative_path_fixes2.diff @@ -0,0 +1,38 @@ +Improved error handling for cmLocalGenerator::Convert(). + +Small inconsistency fix for the previous relative_path_fixes.diff patch. +--- a/Source/cmLocalGenerator.cxx ++++ b/Source/cmLocalGenerator.cxx +@@ -2124,25 +2124,17 @@ + bool optional) + { + const char* remotePath = this->GetRelativeRootPath(remote); ++ ++ // The relative root must have a path (i.e. not FULL or NONE) ++ assert(remotePath != 0); ++ + if(local && (!optional || this->UseRelativePaths)) + { + std::vector components; + std::string result; +- switch(remote) +- { +- case HOME: +- case HOME_OUTPUT: +- case START: +- case START_OUTPUT: +- cmSystemTools::SplitPath(local, components); +- result = this->ConvertToRelativePath(components, remotePath); +- break; +- case FULL: +- result = remotePath; +- break; +- case NONE: +- break; +- } ++ ++ cmSystemTools::SplitPath(local, components); ++ result = this->ConvertToRelativePath(components, remotePath); + return this->ConvertToOutputFormat(result.c_str(), output); + } + else --- cmake-2.6.2.orig/debian/patches/executables-dont-need-fpic.diff +++ cmake-2.6.2/debian/patches/executables-dont-need-fpic.diff @@ -0,0 +1,19 @@ +Any special options needed for linking with shared libraries can be put +in CMAKE_SHARED_LIBRARY_LINK_C_FLAGS. + +See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=478404 + +--- cmake-2.6.0.orig/Source/cmMakefileExecutableTargetGenerator.cxx ++++ cmake-2.6.0/Source/cmMakefileExecutableTargetGenerator.cxx +@@ -201,11 +201,6 @@ + std::string flags; + std::string linkFlags; + +- // Add flags to deal with shared libraries. Any library being +- // linked in might be shared, so always use shared flags for an +- // executable. +- this->LocalGenerator->AddSharedFlags(linkFlags, linkLanguage, true); +- + // Add flags to create an executable. + this->LocalGenerator-> + AddConfigVariableFlags(linkFlags, "CMAKE_EXE_LINKER_FLAGS", --- cmake-2.6.2.orig/debian/patches/do-not-use-lib64.diff +++ cmake-2.6.2/debian/patches/do-not-use-lib64.diff @@ -0,0 +1,18 @@ +--- a/Source/cmFindLibraryCommand.cxx ++++ b/Source/cmFindLibraryCommand.cxx +@@ -158,6 +158,7 @@ + + void cmFindLibraryCommand::AddLib64Paths() + { ++#if 0 /* should not be done on Debian, just make it do nothing */ + if(!this->Makefile->GetLocalGenerator()->GetGlobalGenerator()-> + GetLanguageEnabled("C")) + { +@@ -205,6 +206,7 @@ + { + this->SearchPaths = path64; + } ++#endif + } + + //---------------------------------------------------------------------------- --- cmake-2.6.2.orig/debian/patches/manpage-generation-fixes.diff +++ cmake-2.6.2/debian/patches/manpage-generation-fixes.diff @@ -0,0 +1,510 @@ +date: 2008-10-10 18:23:35 +0300; author: king; state: Exp; lines: +115 -12; commitid: pFogEk9NmHzoT5mt; +ENH: Improve generated documentation formatting + +Applying patch provided in issue #7797. + +Fixes to man-pages: +* Character '-' must be espaced as '\-' +* Surround preformatted text with '.nf' and '.fi' to adjust filling +* Give every page a NAME section for indexing by mandb +* Pass the man page filename without extension to .TH in its header + +Also added a title to the HTML header. + +The patch can be retrieved from upstream CVS with: +$ cvs diff -u -D "2008-10-10 18:23 +0300" -D "2008-10-10 18:24 +0300" + +"File version" hunks were removed for the patch to apply. +--- a/Source/cmDocumentation.cxx ++++ b/Source/cmDocumentation.cxx +@@ -202,6 +202,26 @@ + }; + + //---------------------------------------------------------------------------- ++#define DOCUMENT_INTRO(type, default_name, desc) \ ++ static char const *cmDocumentation##type##Intro[2] = { default_name, desc }; ++#define GET_DOCUMENT_INTRO(type) cmDocumentation##type##Intro ++ ++DOCUMENT_INTRO(Modules, "cmakemodules", ++ "Reference of available CMake modules."); ++DOCUMENT_INTRO(CustomModules, "cmakecustommodules", ++ "Reference of available CMake custom modules."); ++DOCUMENT_INTRO(Policies, "cmakepolicies", ++ "Reference of CMake policies."); ++DOCUMENT_INTRO(Properties, "cmakeprops", ++ "Reference of CMake properties."); ++DOCUMENT_INTRO(Variables, "cmakevars", ++ "Reference of CMake variables."); ++DOCUMENT_INTRO(Commands, "cmakecommands", ++ "Reference of available CMake commands."); ++DOCUMENT_INTRO(CompatCommands, "cmakecompat", ++ "Reference of CMake compatibility commands."); ++ ++//---------------------------------------------------------------------------- + cmDocumentation::cmDocumentation() + :CurrentFormatter(0) + { +@@ -321,7 +341,27 @@ + } + + //---------------------------------------------------------------------------- +-bool cmDocumentation::PrintDocumentation(Type ht, std::ostream& os) ++void cmDocumentation::AddDocumentIntroToPrint(const char* intro[2]) ++{ ++ const char* docname; ++ if (intro && (docname = this->GetDocName(false))) ++ { ++ cmDocumentationSection* section; ++ std::string desc(""); ++ ++ desc += docname; ++ desc += " - "; ++ desc += intro[1]; ++ ++ section = new cmDocumentationSection("Introduction", "NAME"); ++ section->Append(0, desc.c_str(), 0); ++ this->PrintSections.push_back(section); ++ } ++} ++ ++//---------------------------------------------------------------------------- ++bool cmDocumentation::PrintDocumentation(Type ht, std::ostream& os, ++ const char* docname) + { + if ((this->CurrentFormatter->GetForm() != HTMLForm) + && (this->CurrentFormatter->GetForm() != DocbookForm) +@@ -330,6 +370,16 @@ + this->PrintVersion(os); + } + ++ // Handle Document Name. docname==0 disables intro. ++ this->SetDocName(""); ++ if (docname) ++ { ++ if (*docname) ++ this->SetDocName(docname); ++ else // empty string was given. select default if possible ++ this->SetDocName(this->GetDefaultDocName(ht)); ++ } ++ + switch (ht) + { + case cmDocumentation::Usage: +@@ -595,6 +645,7 @@ + // given stream. + std::ofstream* fout = 0; + std::ostream* s = &os; ++ std::string docname(""); + if(i->Filename.length() > 0) + { + fout = new std::ofstream(i->Filename.c_str(), std::ios::out); +@@ -606,10 +657,14 @@ + { + result = false; + } ++ if(i->Filename != "-") ++ { ++ docname = cmSystemTools::GetFilenameWithoutLastExtension(i->Filename); ++ } + } + + // Print this documentation type to the stream. +- if(!this->PrintDocumentation(i->HelpType, *s) || !*s) ++ if(!this->PrintDocumentation(i->HelpType, *s, docname.c_str()) || !*s) + { + result = false; + } +@@ -634,7 +689,7 @@ + cmDocumentation::Form cmDocumentation::GetFormFromFilename( + const std::string& filename) + { +- std::string ext = cmSystemTools::GetFilenameExtension(filename); ++ std::string ext = cmSystemTools::GetFilenameLastExtension(filename); + ext = cmSystemTools::UpperCase(ext); + if ((ext == ".HTM") || (ext == ".HTML")) + { +@@ -870,6 +925,12 @@ + } + + //---------------------------------------------------------------------------- ++void cmDocumentation::SetDocName(const char *docname) ++{ ++ this->DocName = docname?docname:""; ++} ++ ++//---------------------------------------------------------------------------- + void cmDocumentation::SetSection(const char *name, + cmDocumentationSection *section) + { +@@ -1233,7 +1294,7 @@ + bool cmDocumentation::PrintDocumentationFull(std::ostream& os) + { + this->CreateFullDocumentation(); +- this->CurrentFormatter->PrintHeader(GetNameString(), os); ++ this->CurrentFormatter->PrintHeader(GetNameString(), GetNameString(), os); + this->Print(os); + this->CurrentFormatter->PrintFooter(os); + return true; +@@ -1244,11 +1305,12 @@ + { + this->ClearSections(); + this->CreateModulesSection(); ++ this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Modules)); + this->AddSectionToPrint("Description"); + this->AddSectionToPrint("Modules"); + this->AddSectionToPrint("Copyright"); + this->AddSectionToPrint("See Also"); +- this->CurrentFormatter->PrintHeader(this->GetNameString(), os); ++ this->CurrentFormatter->PrintHeader(GetDocName(), GetNameString(), os); + this->Print(os); + this->CurrentFormatter->PrintFooter(os); + return true; +@@ -1259,13 +1321,14 @@ + { + this->ClearSections(); + this->CreateCustomModulesSection(); ++ this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(CustomModules)); + this->AddSectionToPrint("Description"); + this->AddSectionToPrint("Custom CMake Modules"); + // the custom modules are most probably not under Kitware's copyright, Alex + // this->AddSectionToPrint("Copyright"); + this->AddSectionToPrint("See Also"); + +- this->CurrentFormatter->PrintHeader(this->GetNameString(), os); ++ this->CurrentFormatter->PrintHeader(GetDocName(), GetNameString(), os); + this->Print(os); + this->CurrentFormatter->PrintFooter(os); + return true; +@@ -1275,12 +1338,13 @@ + bool cmDocumentation::PrintDocumentationPolicies(std::ostream& os) + { + this->ClearSections(); ++ this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Policies)); + this->AddSectionToPrint("Description"); + this->AddSectionToPrint("Policies"); + this->AddSectionToPrint("Copyright"); + this->AddSectionToPrint("See Also"); + +- this->CurrentFormatter->PrintHeader(this->GetNameString(), os); ++ this->CurrentFormatter->PrintHeader(GetDocName(), GetNameString(), os); + this->Print(os); + this->CurrentFormatter->PrintFooter(os); + return true; +@@ -1290,6 +1354,7 @@ + bool cmDocumentation::PrintDocumentationProperties(std::ostream& os) + { + this->ClearSections(); ++ this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Properties)); + this->AddSectionToPrint("Properties Description"); + for (std::vector::iterator i = + this->PropertySections.begin(); +@@ -1299,7 +1364,7 @@ + } + this->AddSectionToPrint("Copyright"); + this->AddSectionToPrint("Standard See Also"); +- this->CurrentFormatter->PrintHeader(this->GetNameString(), os); ++ this->CurrentFormatter->PrintHeader(GetDocName(), GetNameString(), os); + this->Print(os); + this->CurrentFormatter->PrintFooter(os); + return true; +@@ -1309,6 +1374,7 @@ + bool cmDocumentation::PrintDocumentationVariables(std::ostream& os) + { + this->ClearSections(); ++ this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Variables)); + for (std::vector::iterator i = + this->VariableSections.begin(); + i != this->VariableSections.end(); ++i) +@@ -1317,7 +1383,7 @@ + } + this->AddSectionToPrint("Copyright"); + this->AddSectionToPrint("Standard See Also"); +- this->CurrentFormatter->PrintHeader(this->GetNameString(), os); ++ this->CurrentFormatter->PrintHeader(GetDocName(), GetNameString(), os); + this->Print(os); + this->CurrentFormatter->PrintFooter(os); + return true; +@@ -1327,10 +1393,11 @@ + bool cmDocumentation::PrintDocumentationCurrentCommands(std::ostream& os) + { + this->ClearSections(); ++ this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Commands)); + this->AddSectionToPrint("Commands"); + this->AddSectionToPrint("Copyright"); + this->AddSectionToPrint("Standard See Also"); +- this->CurrentFormatter->PrintHeader(this->GetNameString(), os); ++ this->CurrentFormatter->PrintHeader(GetDocName(), GetNameString(), os); + this->Print(os); + this->CurrentFormatter->PrintFooter(os); + return true; +@@ -1340,11 +1407,12 @@ + bool cmDocumentation::PrintDocumentationCompatCommands(std::ostream& os) + { + this->ClearSections(); ++ this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(CompatCommands)); + this->AddSectionToPrint("Compatibility Commands Description"); + this->AddSectionToPrint("Compatibility Commands"); + this->AddSectionToPrint("Copyright"); + this->AddSectionToPrint("Standard See Also"); +- this->CurrentFormatter->PrintHeader(GetNameString(), os); ++ this->CurrentFormatter->PrintHeader(GetDocName(), GetNameString(), os); + this->Print(os); + this->CurrentFormatter->PrintFooter(os); + return true; +@@ -1466,6 +1534,41 @@ + } + + //---------------------------------------------------------------------------- ++const char* cmDocumentation::GetDocName(bool fallbackToNameString) const ++{ ++ if (this->DocName.length() > 0) ++ { ++ return this->DocName.c_str(); ++ } ++ else if (fallbackToNameString) ++ { ++ return this->GetNameString(); ++ } ++ else ++ return 0; ++} ++ ++//---------------------------------------------------------------------------- ++#define CASE_DEFAULT_DOCNAME(doctype) \ ++ case cmDocumentation::doctype : \ ++ return GET_DOCUMENT_INTRO(doctype)[0]; ++const char* cmDocumentation::GetDefaultDocName(Type ht) const ++{ ++ switch (ht) ++ { ++ CASE_DEFAULT_DOCNAME(Modules) ++ CASE_DEFAULT_DOCNAME(CustomModules) ++ CASE_DEFAULT_DOCNAME(Policies) ++ CASE_DEFAULT_DOCNAME(Properties) ++ CASE_DEFAULT_DOCNAME(Variables) ++ CASE_DEFAULT_DOCNAME(Commands) ++ CASE_DEFAULT_DOCNAME(CompatCommands) ++ default: break; ++ } ++ return 0; ++} ++ ++//---------------------------------------------------------------------------- + bool cmDocumentation::IsOption(const char* arg) const + { + return ((arg[0] == '-') || (strcmp(arg, "/V") == 0) || +--- a/Source/cmDocumentation.h ++++ b/Source/cmDocumentation.h +@@ -61,7 +61,7 @@ + bool PrintRequestedDocumentation(std::ostream& os); + + /** Print help of the given type. */ +- bool PrintDocumentation(Type ht, std::ostream& os); ++ bool PrintDocumentation(Type ht, std::ostream& os, const char* docname=0); + + /** Set the program name for standard document generation. */ + void SetName(const char* name); +@@ -124,6 +124,7 @@ + + private: + void SetForm(Form f); ++ void SetDocName(const char* docname); + + bool CreateSingleModule(const char* fname, + const char* moduleName, +@@ -134,6 +135,8 @@ + bool CreateCustomModulesSection(); + void CreateFullDocumentation(); + ++ void AddDocumentIntroToPrint(const char* intro[2]); ++ + bool PrintCopyright(std::ostream& os); + bool PrintVersion(std::ostream& os); + bool PrintDocumentationGeneric(std::ostream& os, const char *section); +@@ -157,9 +160,12 @@ + + + const char* GetNameString() const; ++ const char* GetDocName(bool fallbackToNameString = true) const; ++ const char* GetDefaultDocName(Type ht) const; + bool IsOption(const char* arg) const; + + std::string NameString; ++ std::string DocName; + std::map AllSections; + + std::string SeeAlsoString; +--- a/Source/cmDocumentationFormatter.cxx ++++ b/Source/cmDocumentationFormatter.cxx +@@ -118,7 +118,8 @@ + { + return "module"; + } +- else if(name.find("Name") != name.npos) ++ else if(name.find("Name") != name.npos || ++ name.find("Introduction") != name.npos) + { + return "name"; + } +--- a/Source/cmDocumentationFormatter.h ++++ b/Source/cmDocumentationFormatter.h +@@ -52,7 +52,9 @@ + + virtual cmDocumentationEnums::Form GetForm() const = 0; + +- virtual void PrintHeader(const char* /*name*/, std::ostream& /*os*/) {} ++ virtual void PrintHeader(const char* /*docname*/, ++ const char* /*appname*/, ++ std::ostream& /*os*/) {} + virtual void PrintFooter(std::ostream& /*os*/) {} + virtual void PrintSection(std::ostream& os, + const cmDocumentationSection& section, +--- a/Source/cmDocumentationFormatterDocbook.cxx ++++ b/Source/cmDocumentationFormatterDocbook.cxx +@@ -229,8 +229,9 @@ + } + + //---------------------------------------------------------------------------- +-void cmDocumentationFormatterDocbook::PrintHeader(const char* name, +- std::ostream& os) ++void cmDocumentationFormatterDocbook::PrintHeader(const char* docname, ++ const char* appname, ++ std::ostream& os) + { + // this one is used to ensure that we don't create multiple link targets + // with the same name. We can clear it here since we are at the +@@ -244,7 +245,7 @@ + " ]>\n" + "
\n" + "\n" +- "" << name << "\n" ++ "" << docname << " - " << appname << "\n" + "\n"; + } + +--- a/Source/cmDocumentationFormatterDocbook.h ++++ b/Source/cmDocumentationFormatterDocbook.h +@@ -31,7 +31,8 @@ + virtual cmDocumentationEnums::Form GetForm() const + { return cmDocumentationEnums::DocbookForm;} + +- virtual void PrintHeader(const char* name, std::ostream& os); ++ virtual void PrintHeader(const char* docname, const char* appname, ++ std::ostream& os); + virtual void PrintFooter(std::ostream& os); + virtual void PrintSection(std::ostream& os, + const cmDocumentationSection& section, +--- a/Source/cmDocumentationFormatterHTML.cxx ++++ b/Source/cmDocumentationFormatterHTML.cxx +@@ -202,10 +202,13 @@ + } + + //---------------------------------------------------------------------------- +-void cmDocumentationFormatterHTML::PrintHeader(const char* /*name*/, ++void cmDocumentationFormatterHTML::PrintHeader(const char* docname, ++ const char* appname, + std::ostream& os) + { +- os << "\n"; ++ os << ""; ++ os << docname << " - " << appname; ++ os << "\n"; + } + + //---------------------------------------------------------------------------- +--- a/Source/cmDocumentationFormatterHTML.h ++++ b/Source/cmDocumentationFormatterHTML.h +@@ -30,7 +30,8 @@ + virtual cmDocumentationEnums::Form GetForm() const + { return cmDocumentationEnums::HTMLForm;} + +- virtual void PrintHeader(const char* name, std::ostream& os); ++ virtual void PrintHeader(const char* docname, const char* appname, ++ std::ostream& os); + virtual void PrintFooter(std::ostream& os); + virtual void PrintSection(std::ostream& os, + const cmDocumentationSection& section, +--- a/Source/cmDocumentationFormatterMan.cxx ++++ b/Source/cmDocumentationFormatterMan.cxx +@@ -57,30 +57,44 @@ + } + } + ++void cmDocumentationFormatterMan::EscapeText(std::string& man_text) ++{ ++ cmSystemTools::ReplaceString(man_text, "\\", "\\\\"); ++ cmSystemTools::ReplaceString(man_text, "-", "\\-"); ++} ++ + void cmDocumentationFormatterMan::PrintPreformatted(std::ostream& os, + const char* text) + { + std::string man_text = text; +- cmSystemTools::ReplaceString(man_text, "\\", "\\\\"); +- os << man_text << "\n"; ++ this->EscapeText(man_text); ++ os << ".nf\n" << man_text; ++ if (*text && man_text.at(man_text.length()-1) != '\n') ++ os << "\n"; ++ os << ".fi\n"; + } + + void cmDocumentationFormatterMan::PrintParagraph(std::ostream& os, + const char* text) + { + std::string man_text = text; +- cmSystemTools::ReplaceString(man_text, "\\", "\\\\"); ++ this->EscapeText(man_text); + os << man_text << "\n\n"; + } + + + //---------------------------------------------------------------------------- +-void cmDocumentationFormatterMan::PrintHeader(const char* name, ++void cmDocumentationFormatterMan::PrintHeader(const char* docname, ++ const char* appname, + std::ostream& os) + { +- os << ".TH " << name << " 1 \"" ++ std::string s_docname(docname), s_appname(appname); ++ ++ this->EscapeText(s_docname); ++ this->EscapeText(s_appname); ++ os << ".TH " << s_docname << " 1 \"" + << cmSystemTools::GetCurrentDateTime("%B %d, %Y").c_str() +- << "\" \"" << name ++ << "\" \"" << s_appname + << " " << cmVersion::GetCMakeVersion() + << "\"\n"; + } +--- a/Source/cmDocumentationFormatterMan.h ++++ b/Source/cmDocumentationFormatterMan.h +@@ -30,12 +30,16 @@ + virtual cmDocumentationEnums::Form GetForm() const + { return cmDocumentationEnums::ManForm;} + +- virtual void PrintHeader(const char* name, std::ostream& os); ++ virtual void PrintHeader(const char* docname, const char* appname, ++ std::ostream& os); + virtual void PrintSection(std::ostream& os, + const cmDocumentationSection& section, + const char* name); + virtual void PrintPreformatted(std::ostream& os, const char* text); + virtual void PrintParagraph(std::ostream& os, const char* text); ++ ++private: ++ void EscapeText(std::string& man_text); + }; + + #endif +--- a/Source/kwsys/SystemTools.cxx ++++ b/Source/kwsys/SystemTools.cxx +@@ -3382,7 +3382,7 @@ + + /** + * Return file extension of a full filename (dot included). +- * Warning: this is the shortest extension (for example: .tar.gz) ++ * Warning: this is the shortest extension (for example: .gz of .tar.gz) + */ + kwsys_stl::string SystemTools::GetFilenameLastExtension(const kwsys_stl::string& filename) + { --- cmake-2.6.2.orig/debian/patches/series +++ cmake-2.6.2/debian/patches/series @@ -0,0 +1,11 @@ +FindQt4.cmake2.6.diff +do-not-use-lib64.diff +findmpeg2-addpath.diff +kfreebsd-Platform.diff +executables-dont-need-fpic.diff +reinstate-arm.diff +relative_path_fixes.diff +relative_path_fixes2.diff +manpage-generation-fixes.diff +CVE_2009_3720.patch +CVE_2009_3560.patch --- cmake-2.6.2.orig/debian/patches/kfreebsd-Platform.diff +++ cmake-2.6.2/debian/patches/kfreebsd-Platform.diff @@ -0,0 +1,22 @@ +--- cmake-2.6.0-RC-8.orig/Modules/CMakeDetermineSystem.cmake ++++ cmake-2.6.0-RC-8/Modules/CMakeDetermineSystem.cmake +@@ -12,6 +12,7 @@ + # HP-UX HP-UX + # IRIX IRIX + # Linux Linux ++# GNU/kFreeBSD GNU/kFreeBSD + # NetBSD NetBSD + # OpenBSD OpenBSD + # OFS/1 (Digital Unix) OSF1 +@@ -108,6 +109,11 @@ + SET(${_PREFIX}_NAME BSDOS) + ENDIF(${_PREFIX}_NAME MATCHES BSD.OS) + ++ # fix for GNU/kFreeBSD , remove the GNU/ ++ IF(CMAKE_SYSTEM_NAME MATCHES GNU.kFreeBSD) ++ SET(CMAKE_SYSTEM_NAME kFreeBSD) ++ ENDIF(CMAKE_SYSTEM_NAME MATCHES GNU.kFreeBSD) ++ + # fix for CYGWIN which has windows version in it + IF(${_PREFIX}_NAME MATCHES CYGWIN) + SET(${_PREFIX}_NAME CYGWIN) --- cmake-2.6.2.orig/debian/patches/relative_path_fixes.diff +++ cmake-2.6.2/debian/patches/relative_path_fixes.diff @@ -0,0 +1,510 @@ +date: 2008-10-09 22:30:07 +0300; author: king; state: Exp; lines: +29 -30; commitid: jdAfWT6Sw8VXhZlt; +ENH: Fix optional use of relative paths. + +These changes refactor cmLocalGenerator methods Convert and +ConvertToOutputForExisting to support references inside the build tree +using relative paths. After this commit, all tests pass with Makefile +generators when relative paths are enabled by default. See issue #7779. + +The patch can be retrieved from upstream CVS with: +$ cvs diff -u -D "2008-10-09 22:30 +0300" -D "2008-10-09 22:31 +0300" + +"File version" hunks were removed for the patch to apply. Also one hunk +was unfuzzed. +--- a/Source/cmLocalGenerator.cxx ++++ b/Source/cmLocalGenerator.cxx +@@ -1074,22 +1074,54 @@ + s = expandedInput; + } + +- +-std::string +-cmLocalGenerator::ConvertToOutputForExisting(const char* p) ++//---------------------------------------------------------------------------- ++std::string ++cmLocalGenerator::ConvertToOutputForExistingCommon(const char* remote, ++ std::string const& result) + { +- std::string ret = p; +- if(this->WindowsShell && ret.find(' ') != ret.npos +- && cmSystemTools::FileExists(p)) ++ // If this is a windows shell, the result has a space, and the path ++ // already exists, we can use a short-path to reference it without a ++ // space. ++ if(this->WindowsShell && result.find(' ') != result.npos && ++ cmSystemTools::FileExists(remote)) + { +- if(cmSystemTools::GetShortPath(p, ret)) ++ std::string tmp; ++ if(cmSystemTools::GetShortPath(remote, tmp)) + { +- return this->Convert(ret.c_str(), NONE, SHELL, true); ++ return this->Convert(tmp.c_str(), NONE, SHELL, true); + } + } +- return this->Convert(p, START_OUTPUT, SHELL, true); ++ ++ // Otherwise, leave it unchanged. ++ return result; ++} ++ ++//---------------------------------------------------------------------------- ++std::string ++cmLocalGenerator::ConvertToOutputForExisting(const char* remote, ++ RelativeRoot local) ++{ ++ // Perform standard conversion. ++ std::string result = this->Convert(remote, local, SHELL, true); ++ ++ // Consider short-path. ++ return this->ConvertToOutputForExistingCommon(remote, result); ++} ++ ++//---------------------------------------------------------------------------- ++std::string ++cmLocalGenerator::ConvertToOutputForExisting(RelativeRoot remote, ++ const char* local) ++{ ++ // Perform standard conversion. ++ std::string result = this->Convert(remote, local, SHELL, true); ++ ++ // Consider short-path. ++ const char* remotePath = this->GetRelativeRootPath(remote); ++ return this->ConvertToOutputForExistingCommon(remotePath, result); + } + ++//---------------------------------------------------------------------------- + const char* cmLocalGenerator::GetIncludeFlags(const char* lang) + { + if(!lang) +@@ -1983,7 +2015,21 @@ + } + + //---------------------------------------------------------------------------- +-std::string cmLocalGenerator::Convert(const char* source, ++const char* cmLocalGenerator::GetRelativeRootPath(RelativeRoot relroot) ++{ ++ switch (relroot) ++ { ++ case HOME: return this->Makefile->GetHomeDirectory(); ++ case START: return this->Makefile->GetStartDirectory(); ++ case HOME_OUTPUT: return this->Makefile->GetHomeOutputDirectory(); ++ case START_OUTPUT: return this->Makefile->GetStartOutputDirectory(); ++ default: break; ++ } ++ return 0; ++} ++ ++//---------------------------------------------------------------------------- ++std::string cmLocalGenerator::Convert(const char* source, + RelativeRoot relative, + OutputFormat output, + bool optional) +@@ -2031,7 +2077,15 @@ + break; + } + } +- // Now convert it to an output path. ++ return this->ConvertToOutputFormat(result.c_str(), output); ++} ++ ++//---------------------------------------------------------------------------- ++std::string cmLocalGenerator::ConvertToOutputFormat(const char* source, ++ OutputFormat output) ++{ ++ std::string result = source; ++ // Convert it to an output path. + if (output == MAKEFILE) + { + result = cmSystemTools::ConvertToOutputPath(result.c_str()); +@@ -2064,6 +2118,40 @@ + } + + //---------------------------------------------------------------------------- ++std::string cmLocalGenerator::Convert(RelativeRoot remote, ++ const char* local, ++ OutputFormat output, ++ bool optional) ++{ ++ const char* remotePath = this->GetRelativeRootPath(remote); ++ if(local && (!optional || this->UseRelativePaths)) ++ { ++ std::vector components; ++ std::string result; ++ switch(remote) ++ { ++ case HOME: ++ case HOME_OUTPUT: ++ case START: ++ case START_OUTPUT: ++ cmSystemTools::SplitPath(local, components); ++ result = this->ConvertToRelativePath(components, remotePath); ++ break; ++ case FULL: ++ result = remotePath; ++ break; ++ case NONE: ++ break; ++ } ++ return this->ConvertToOutputFormat(result.c_str(), output); ++ } ++ else ++ { ++ return this->ConvertToOutputFormat(remotePath, output); ++ } ++} ++ ++//---------------------------------------------------------------------------- + std::string cmLocalGenerator::FindRelativePathTopSource() + { + // Relative path conversion within a single tree managed by CMake is +--- a/Source/cmLocalGenerator.h ++++ b/Source/cmLocalGenerator.h +@@ -108,10 +108,18 @@ + */ + enum RelativeRoot { NONE, FULL, HOME, START, HOME_OUTPUT, START_OUTPUT }; + enum OutputFormat { UNCHANGED, MAKEFILE, SHELL }; +- std::string Convert(const char* source, +- RelativeRoot relative, ++ std::string ConvertToOutputFormat(const char* source, OutputFormat output); ++ std::string Convert(const char* remote, RelativeRoot local, + OutputFormat output = UNCHANGED, + bool optional = false); ++ std::string Convert(RelativeRoot remote, const char* local, ++ OutputFormat output = UNCHANGED, ++ bool optional = false); ++ ++ /** ++ * Get path for the specified relative root. ++ */ ++ const char* GetRelativeRootPath(RelativeRoot relroot); + + /** + * Convert the given path to an output path that is optionally +@@ -162,7 +170,13 @@ + std::string GetRealLocation(const char* inName, const char* config); + + ///! for existing files convert to output path and short path if spaces +- std::string ConvertToOutputForExisting(const char* p); ++ std::string ConvertToOutputForExisting(const char* remote, ++ RelativeRoot local = START_OUTPUT); ++ ++ /** For existing path identified by RelativeRoot convert to output ++ path and short path if spaces. */ ++ std::string ConvertToOutputForExisting(RelativeRoot remote, ++ const char* local = 0); + + /** Called from command-line hook to clear dependencies. */ + virtual void ClearDependencies(cmMakefile* /* mf */, +@@ -386,6 +400,9 @@ + + unsigned int BackwardsCompatibility; + bool BackwardsCompatibilityFinal; ++private: ++ std::string ConvertToOutputForExistingCommon(const char* remote, ++ std::string const& result); + }; + + #endif +--- a/Source/cmLocalUnixMakefileGenerator3.cxx ++++ b/Source/cmLocalUnixMakefileGenerator3.cxx +@@ -360,7 +360,7 @@ + ); + this->CreateCDCommand(commands, + this->Makefile->GetHomeOutputDirectory(), +- this->Makefile->GetStartOutputDirectory()); ++ cmLocalGenerator::START_OUTPUT); + } + + // Write the rule to the makefile. +@@ -404,7 +404,7 @@ + (makefile2.c_str(),localName.c_str())); + this->CreateCDCommand(commands, + this->Makefile->GetHomeOutputDirectory(), +- this->Makefile->GetStartOutputDirectory()); ++ cmLocalGenerator::START_OUTPUT); + this->WriteMakeRule(ruleFileStream, "Convenience name for target.", + localName.c_str(), depends, commands, true); + +@@ -432,7 +432,7 @@ + (makefileName.c_str(), makeTargetName.c_str())); + this->CreateCDCommand(commands, + this->Makefile->GetHomeOutputDirectory(), +- this->Makefile->GetStartOutputDirectory()); ++ cmLocalGenerator::START_OUTPUT); + this->WriteMakeRule(ruleFileStream, "fast build rule for target.", + localName.c_str(), depends, commands, true); + +@@ -450,7 +450,7 @@ + (makefile2.c_str(), makeTargetName.c_str())); + this->CreateCDCommand(commands, + this->Makefile->GetHomeOutputDirectory(), +- this->Makefile->GetStartOutputDirectory()); ++ cmLocalGenerator::START_OUTPUT); + this->WriteMakeRule(ruleFileStream, + "Manual pre-install relink rule for target.", + localName.c_str(), depends, commands, true); +@@ -835,7 +835,7 @@ + { + this->CreateCDCommand(commands, + this->Makefile->GetHomeOutputDirectory(), +- this->Makefile->GetStartOutputDirectory()); ++ cmLocalGenerator::START_OUTPUT); + } + this->WriteMakeRule(makefileStream, + "Special rule to run CMake to check the build system " +@@ -953,12 +953,13 @@ + void + cmLocalUnixMakefileGenerator3 + ::AppendCustomCommands(std::vector& commands, +- const std::vector& ccs) ++ const std::vector& ccs, ++ cmLocalGenerator::RelativeRoot relative) + { + for(std::vector::const_iterator i = ccs.begin(); + i != ccs.end(); ++i) + { +- this->AppendCustomCommand(commands, *i, true); ++ this->AppendCustomCommand(commands, *i, true, relative); + } + } + +@@ -966,7 +967,8 @@ + void + cmLocalUnixMakefileGenerator3 + ::AppendCustomCommand(std::vector& commands, +- const cmCustomCommand& cc, bool echo_comment) ++ const cmCustomCommand& cc, bool echo_comment, ++ cmLocalGenerator::RelativeRoot relative) + { + // Optionally create a command to display the custom command's + // comment text. This is used for pre-build, pre-link, and +@@ -1072,8 +1074,7 @@ + } + + // Setup the proper working directory for the commands. +- this->CreateCDCommand(commands1, dir, +- this->Makefile->GetHomeOutputDirectory()); ++ this->CreateCDCommand(commands1, dir, relative); + + // push back the custom commands + commands.insert(commands.end(), commands1.begin(), commands1.end()); +@@ -1610,9 +1611,11 @@ + this->AppendCustomDepends(depends, + glIt->second.GetPostBuildCommands()); + this->AppendCustomCommands(commands, +- glIt->second.GetPreBuildCommands()); ++ glIt->second.GetPreBuildCommands(), ++ cmLocalGenerator::START_OUTPUT); + this->AppendCustomCommands(commands, +- glIt->second.GetPostBuildCommands()); ++ glIt->second.GetPostBuildCommands(), ++ cmLocalGenerator::START_OUTPUT); + std::string targetName = glIt->second.GetName(); + this->WriteMakeRule(ruleFileStream, targetString.c_str(), + targetName.c_str(), depends, commands, true); +@@ -1674,7 +1677,7 @@ + recursiveTarget.c_str())); + this->CreateCDCommand(commands, + this->Makefile->GetHomeOutputDirectory(), +- this->Makefile->GetStartOutputDirectory()); ++ cmLocalGenerator::START_OUTPUT); + { + cmOStringStream progCmd; + progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # 0 +@@ -1696,7 +1699,7 @@ + recursiveTarget.c_str())); + this->CreateCDCommand(commands, + this->Makefile->GetHomeOutputDirectory(), +- this->Makefile->GetStartOutputDirectory()); ++ cmLocalGenerator::START_OUTPUT); + this->WriteMakeRule(ruleFileStream, "The main clean target", "clean", + depends, commands, true); + commands.clear(); +@@ -1726,7 +1729,7 @@ + (this->GetRecursiveMakeCall(mf2Dir.c_str(), recursiveTarget.c_str())); + this->CreateCDCommand(commands, + this->Makefile->GetHomeOutputDirectory(), +- this->Makefile->GetStartOutputDirectory()); ++ cmLocalGenerator::START_OUTPUT); + this->WriteMakeRule(ruleFileStream, "Prepare targets for installation.", + "preinstall", depends, commands, true); + depends.clear(); +@@ -1747,7 +1750,7 @@ + commands.push_back(runRule); + this->CreateCDCommand(commands, + this->Makefile->GetHomeOutputDirectory(), +- this->Makefile->GetStartOutputDirectory()); ++ cmLocalGenerator::START_OUTPUT); + this->WriteMakeRule(ruleFileStream, "clear depends", + "depend", + depends, commands, true); +@@ -2126,8 +2129,10 @@ + //---------------------------------------------------------------------------- + void cmLocalUnixMakefileGenerator3 + ::CreateCDCommand(std::vector& commands, const char *tgtDir, +- const char *retDir) ++ cmLocalGenerator::RelativeRoot relRetDir) + { ++ const char* retDir = this->GetRelativeRootPath(relRetDir); ++ + // do we need to cd? + if (!strcmp(tgtDir,retDir)) + { +@@ -2140,18 +2145,12 @@ + // back because the shell keeps the working directory between + // commands. + std::string cmd = "cd "; +- cmd += this->ConvertToOutputForExisting(tgtDir); ++ cmd += this->ConvertToOutputForExisting(tgtDir, relRetDir); + commands.insert(commands.begin(),cmd); +- +- // Change back to the starting directory. Any trailing slash must be +- // removed to avoid problems with Borland Make. +- std::string back = retDir; +- if(back.size() && back[back.size()-1] == '/') +- { +- back = back.substr(0, back.size()-1); +- } ++ ++ // Change back to the starting directory. + cmd = "cd "; +- cmd += this->ConvertToOutputForExisting(back.c_str()); ++ cmd += this->ConvertToOutputForExisting(relRetDir, tgtDir); + commands.push_back(cmd); + } + else +@@ -2163,7 +2162,7 @@ + for (; i != commands.end(); ++i) + { + std::string cmd = "cd "; +- cmd += this->ConvertToOutputForExisting(tgtDir); ++ cmd += this->ConvertToOutputForExisting(tgtDir, relRetDir); + cmd += " && "; + cmd += *i; + *i = cmd; +--- a/Source/cmLocalUnixMakefileGenerator3.h ++++ b/Source/cmLocalUnixMakefileGenerator3.h +@@ -197,7 +197,8 @@ + + // create a command that cds to the start dir then runs the commands + void CreateCDCommand(std::vector& commands, +- const char *targetDir, const char *returnDir); ++ const char *targetDir, ++ cmLocalGenerator::RelativeRoot returnDir); + + static std::string ConvertToQuotedOutputPath(const char* p); + +@@ -321,10 +322,14 @@ + void AppendCustomDepend(std::vector& depends, + const cmCustomCommand& cc); + void AppendCustomCommands(std::vector& commands, +- const std::vector& ccs); ++ const std::vector& ccs, ++ cmLocalGenerator::RelativeRoot relative = ++ cmLocalGenerator::HOME_OUTPUT); + void AppendCustomCommand(std::vector& commands, + const cmCustomCommand& cc, +- bool echo_comment=false); ++ bool echo_comment=false, ++ cmLocalGenerator::RelativeRoot relative = ++ cmLocalGenerator::HOME_OUTPUT); + void AppendCleanCommand(std::vector& commands, + const std::vector& files, + cmTarget& target, const char* filename =0); +--- a/Source/cmMakefileExecutableTargetGenerator.cxx ++++ b/Source/cmMakefileExecutableTargetGenerator.cxx +@@ -435,7 +435,7 @@ + this->LocalGenerator->CreateCDCommand + (commands1, + this->Makefile->GetStartOutputDirectory(), +- this->Makefile->GetHomeOutputDirectory()); ++ cmLocalGenerator::HOME_OUTPUT); + commands.insert(commands.end(), commands1.begin(), commands1.end()); + commands1.clear(); + +@@ -449,7 +449,7 @@ + commands1.push_back(symlink); + this->LocalGenerator->CreateCDCommand(commands1, + this->Makefile->GetStartOutputDirectory(), +- this->Makefile->GetHomeOutputDirectory()); ++ cmLocalGenerator::HOME_OUTPUT); + commands.insert(commands.end(), commands1.begin(), commands1.end()); + commands1.clear(); + } +--- a/Source/cmMakefileLibraryTargetGenerator.cxx ++++ b/Source/cmMakefileLibraryTargetGenerator.cxx +@@ -591,7 +591,7 @@ + this->LocalGenerator->CreateCDCommand + (commands1, + this->Makefile->GetStartOutputDirectory(), +- this->Makefile->GetHomeOutputDirectory()); ++ cmLocalGenerator::HOME_OUTPUT); + commands.insert(commands.end(), commands1.begin(), commands1.end()); + commands1.clear(); + } +@@ -872,7 +872,7 @@ + this->LocalGenerator->CreateCDCommand + (commands1, + this->Makefile->GetStartOutputDirectory(), +- this->Makefile->GetHomeOutputDirectory()); ++ cmLocalGenerator::HOME_OUTPUT); + commands.insert(commands.end(), commands1.begin(), commands1.end()); + commands1.clear(); + +@@ -888,7 +888,7 @@ + commands1.push_back(symlink); + this->LocalGenerator->CreateCDCommand(commands1, + this->Makefile->GetStartOutputDirectory(), +- this->Makefile->GetHomeOutputDirectory()); ++ cmLocalGenerator::HOME_OUTPUT); + commands.insert(commands.end(), commands1.begin(), commands1.end()); + commands1.clear(); + } +--- a/Source/cmMakefileTargetGenerator.cxx ++++ b/Source/cmMakefileTargetGenerator.cxx +@@ -567,7 +567,7 @@ + if(this->LocalGenerator->UseRelativePaths) + { + sourceFile = this->Convert(sourceFile.c_str(), +- cmLocalGenerator::HOME_OUTPUT); ++ cmLocalGenerator::START_OUTPUT); + } + sourceFile = this->Convert(sourceFile.c_str(), + cmLocalGenerator::NONE, +@@ -614,7 +614,7 @@ + this->LocalGenerator->CreateCDCommand + (compileCommands, + this->Makefile->GetStartOutputDirectory(), +- this->Makefile->GetHomeOutputDirectory()); ++ cmLocalGenerator::HOME_OUTPUT); + commands.insert(commands.end(), + compileCommands.begin(), compileCommands.end()); + +@@ -725,7 +725,7 @@ + this->LocalGenerator->CreateCDCommand + (preprocessCommands, + this->Makefile->GetStartOutputDirectory(), +- this->Makefile->GetHomeOutputDirectory()); ++ cmLocalGenerator::HOME_OUTPUT); + commands.insert(commands.end(), + preprocessCommands.begin(), + preprocessCommands.end()); +@@ -781,7 +781,7 @@ + this->LocalGenerator->CreateCDCommand + (assemblyCommands, + this->Makefile->GetStartOutputDirectory(), +- this->Makefile->GetHomeOutputDirectory()); ++ cmLocalGenerator::HOME_OUTPUT); + commands.insert(commands.end(), + assemblyCommands.begin(), + assemblyCommands.end()); +@@ -895,7 +895,7 @@ + this->LocalGenerator->CreateCDCommand + (commands, + this->Makefile->GetStartOutputDirectory(), +- this->Makefile->GetHomeOutputDirectory()); ++ cmLocalGenerator::HOME_OUTPUT); + + // Write the rule. + this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0, --- cmake-2.6.2.orig/Utilities/cmcurl/CMake/CheckCSourceRuns.cmake +++ cmake-2.6.2/Utilities/cmcurl/CMake/CheckCSourceRuns.cmake @@ -0,0 +1,83 @@ +# - Check if the source code provided in the SOURCE argument compiles and runs. +# CHECK_C_SOURCE_RUNS(SOURCE VAR) +# - macro which checks if the source code runs +# SOURCE - source code to try to compile +# VAR - variable to store size if the type exists. +# +# The following variables may be set before calling this macro to +# modify the way the check is run: +# +# CMAKE_REQUIRED_FLAGS = string of compile command line flags +# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar) +# CMAKE_REQUIRED_INCLUDES = list of include directories +# CMAKE_REQUIRED_LIBRARIES = list of libraries to link + +MACRO(CHECK_C_SOURCE_RUNS SOURCE VAR) + IF("${VAR}" MATCHES "^${VAR}$" OR "${VAR}" MATCHES "UNKNOWN") + SET(message "${VAR}") + # If the number of arguments is greater than 2 (SOURCE VAR) + IF(${ARGC} GREATER 2) + # then add the third argument as a message + SET(message "${ARGV2} (${VAR})") + ENDIF(${ARGC} GREATER 2) + SET(MACRO_CHECK_FUNCTION_DEFINITIONS + "-D${VAR} ${CMAKE_REQUIRED_FLAGS}") + IF(CMAKE_REQUIRED_LIBRARIES) + SET(CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES + "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") + ELSE(CMAKE_REQUIRED_LIBRARIES) + SET(CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES) + ENDIF(CMAKE_REQUIRED_LIBRARIES) + IF(CMAKE_REQUIRED_INCLUDES) + SET(CHECK_C_SOURCE_COMPILES_ADD_INCLUDES + "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}") + ELSE(CMAKE_REQUIRED_INCLUDES) + SET(CHECK_C_SOURCE_COMPILES_ADD_INCLUDES) + ENDIF(CMAKE_REQUIRED_INCLUDES) + SET(src "") + FOREACH(def ${EXTRA_DEFINES}) + SET(src "${src}#define ${def} 1\n") + ENDFOREACH(def) + FOREACH(inc ${HEADER_INCLUDES}) + SET(src "${src}#include <${inc}>\n") + ENDFOREACH(inc) + + SET(src "${src}\nint main() { ${SOURCE} ; return 0; }") + SET(CMAKE_CONFIGURABLE_FILE_CONTENT "${src}") + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/CMake/CMakeConfigurableFile.in + "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c" + IMMEDIATE) + MESSAGE(STATUS "Performing Test ${message}") + TRY_RUN(${VAR} ${VAR}_COMPILED + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c + COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} + CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS} + "${CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES}" + "${CHECK_C_SOURCE_COMPILES_ADD_INCLUDES}" + OUTPUT_VARIABLE OUTPUT) + # if it did not compile make the return value fail code of 1 + IF(NOT ${VAR}_COMPILED) + SET(${VAR} 1) + ENDIF(NOT ${VAR}_COMPILED) + # if the return value was 0 then it worked + SET(result_var ${${VAR}}) + IF("${result_var}" EQUAL 0) + SET(${VAR} 1 CACHE INTERNAL "Test ${message}") + MESSAGE(STATUS "Performing Test ${message} - Success") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Performing C SOURCE FILE Test ${message} succeded with the following output:\n" + "${OUTPUT}\n" + "Return value: ${${VAR}}\n" + "Source file was:\n${src}\n") + ELSE("${result_var}" EQUAL 0) + MESSAGE(STATUS "Performing Test ${message} - Failed") + SET(${VAR} "" CACHE INTERNAL "Test ${message}") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log + "Performing C SOURCE FILE Test ${message} failed with the following output:\n" + "${OUTPUT}\n" + "Return value: ${result_var}\n" + "Source file was:\n${src}\n") + ENDIF("${result_var}" EQUAL 0) + ENDIF("${VAR}" MATCHES "^${VAR}$" OR "${VAR}" MATCHES "UNKNOWN") +ENDMACRO(CHECK_C_SOURCE_RUNS) --- cmake-2.6.2.orig/Utilities/cmcurl/CMake/CheckCSourceCompiles.cmake +++ cmake-2.6.2/Utilities/cmcurl/CMake/CheckCSourceCompiles.cmake @@ -0,0 +1,75 @@ +# - Check if the source code provided in the SOURCE argument compiles. +# CHECK_C_SOURCE_COMPILES(SOURCE VAR) +# - macro which checks if the source code compiles +# SOURCE - source code to try to compile +# VAR - variable to store whether the source code compiled +# +# The following variables may be set before calling this macro to +# modify the way the check is run: +# +# CMAKE_REQUIRED_FLAGS = string of compile command line flags +# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar) +# CMAKE_REQUIRED_INCLUDES = list of include directories +# CMAKE_REQUIRED_LIBRARIES = list of libraries to link + +MACRO(CHECK_C_SOURCE_COMPILES SOURCE VAR) + IF("${VAR}" MATCHES "^${VAR}$" OR "${VAR}" MATCHES "UNKNOWN") + SET(message "${VAR}") + # If the number of arguments is greater than 2 (SOURCE VAR) + IF(${ARGC} GREATER 2) + # then add the third argument as a message + SET(message "${ARGV2} (${VAR})") + ENDIF(${ARGC} GREATER 2) + SET(MACRO_CHECK_FUNCTION_DEFINITIONS + "-D${VAR} ${CMAKE_REQUIRED_FLAGS}") + IF(CMAKE_REQUIRED_LIBRARIES) + SET(CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES + "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") + ELSE(CMAKE_REQUIRED_LIBRARIES) + SET(CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES) + ENDIF(CMAKE_REQUIRED_LIBRARIES) + IF(CMAKE_REQUIRED_INCLUDES) + SET(CHECK_C_SOURCE_COMPILES_ADD_INCLUDES + "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}") + ELSE(CMAKE_REQUIRED_INCLUDES) + SET(CHECK_C_SOURCE_COMPILES_ADD_INCLUDES) + ENDIF(CMAKE_REQUIRED_INCLUDES) + SET(src "") + FOREACH(def ${EXTRA_DEFINES}) + SET(src "${src}#define ${def} 1\n") + ENDFOREACH(def) + FOREACH(inc ${HEADER_INCLUDES}) + SET(src "${src}#include <${inc}>\n") + ENDFOREACH(inc) + + SET(src "${src}\nint main() { ${SOURCE} ; return 0; }") + SET(CMAKE_CONFIGURABLE_FILE_CONTENT "${src}") + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/CMake/CMakeConfigurableFile.in + "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c" + IMMEDIATE) + MESSAGE(STATUS "Performing Test ${message}") + TRY_COMPILE(${VAR} + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c + COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} + CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS} + "${CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES}" + "${CHECK_C_SOURCE_COMPILES_ADD_INCLUDES}" + OUTPUT_VARIABLE OUTPUT) + IF(${VAR}) + SET(${VAR} 1 CACHE INTERNAL "Test ${message}") + MESSAGE(STATUS "Performing Test ${message} - Success") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Performing C SOURCE FILE Test ${message} succeded with the following output:\n" + "${OUTPUT}\n" + "Source file was:\n${src}\n") + ELSE(${VAR}) + MESSAGE(STATUS "Performing Test ${message} - Failed") + SET(${VAR} "" CACHE INTERNAL "Test ${message}") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log + "Performing C SOURCE FILE Test ${message} failed with the following output:\n" + "${OUTPUT}\n" + "Source file was:\n${src}\n") + ENDIF(${VAR}) + ENDIF("${VAR}" MATCHES "^${VAR}$" OR "${VAR}" MATCHES "UNKNOWN") +ENDMACRO(CHECK_C_SOURCE_COMPILES)