summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-simplify-CreateLocalGenerator'David Cole2012-09-186-42/+0
|\ | | | | | | | | f34321a VS: Remove duplicated implementations of CreateLocalGenerator()
| * VS: Remove duplicated implementations of CreateLocalGenerator()Patrick Gansterer2012-09-146-42/+0
| | | | | | | | | | The IA64 and Win64 versions of the VS8 and VS9 generators contain the same code for this function as in the base class.
* | Merge topic 'openscenegraph-simplify-fphsa'David Cole2012-09-181-69/+11
|\ \ | | | | | | | | | | | | 248db6c FindOpenSceneGraph: simplify by using more features of FPHSA
| * | FindOpenSceneGraph: simplify by using more features of FPHSARolf Eike Beer2012-09-121-69/+11
| | |
* | | Merge topic 'if-version-depth'David Cole2012-09-182-6/+17
|\ \ \ | | | | | | | | | | | | | | | | dfa0ebd if: Compare up to 8 components in VERSION tests
| * | | if: Compare up to 8 components in VERSION testsBrad King2012-09-112-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the number of components tested by if(... VERSION_LESS ...) if(... VERSION_EQUAL ...) if(... VERSION_GREATER ...) from 4 to 8. The latter is a more extreme maximum.
* | | | Merge topic 'NewFindGLEWModule'David Cole2012-09-181-0/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | fbda7bb Initial version of find module
| * | | | Initial version of find moduleBenjamin Eikel2012-09-011-0/+30
| | | | |
* | | | | Merge topic 'qt5-qtdialog-port'David Cole2012-09-183-99/+117
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25a4f56 Build with Qt5 if it is found. 717f31a Compile with both Qt4 and Qt5. 066e858 Replace two include_directories with a setting. 430ba9f Use add_subdirectory instead of the obsolete subdirs. 32a5725 Remove an if which is always true. 0b6625c Move variable setting down to where it relates to. 8ab312b Use CMake platform variables instead of Qt ones. bd728f6 Add a return-after-error if an old Qt is found.
| * | | | | Build with Qt5 if it is found.Stephen Kelly2012-08-221-6/+23
| | | | | |
| * | | | | Compile with both Qt4 and Qt5.Stephen Kelly2012-08-211-0/+4
| | | | | |
| * | | | | Replace two include_directories with a setting.Stephen Kelly2012-08-211-2/+1
| | | | | |
| * | | | | Use add_subdirectory instead of the obsolete subdirs.Stephen Kelly2012-08-211-1/+1
| | | | | |
| * | | | | Remove an if which is always true.Stephen Kelly2012-08-211-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | CMake based CMake build requires version 2.8.2 as of version 2.8.9.
| * | | | | Move variable setting down to where it relates to.Stephen Kelly2012-08-211-1/+1
| | | | | |
| * | | | | Use CMake platform variables instead of Qt ones.Stephen Kelly2012-08-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The Qt ones no longer exist in Qt 5.
| * | | | | Add a return-after-error if an old Qt is found.Stephen Kelly2012-08-211-94/+93
| | | | | | | | | | | | | | | | | | | | | | | | No need for an else after a return.
* | | | | | Merge topic 'topics/FindCUDA/Add-CUDA_HOST_COMPILER'David Cole2012-09-182-7/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | db207e4 FindCUDA: Added CUDA_HOST_COMPILER variable.
| * | | | | | FindCUDA: Added CUDA_HOST_COMPILER variable.James Bigler2012-08-202-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a new CUDA variable for specifying the CUDA_HOST_COMPILER. This will allow users to be able to specify which host compiler to use for invoking NVCC with. By default it will use the compiler used for host compilation. This is convenient for when you want to specify a different compiler than the default compiler. You end up using the same compiler for both the NVCC compilation and the host compilation instead of using the default compiler in the path for NVCC.
* | | | | | | CMake Nightly Date StampKitware Robot2012-09-181-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2012-09-171-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2012-09-161-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2012-09-151-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2012-09-141-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2012-09-131-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'file-download-verify'Brad King2012-09-127-40/+201
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bcd84e Utilities/Release: Enable CMAKE_USE_OPENSSL in nightly binaries e1c89f0 file(DOWNLOAD): Add options for SSL 073a73a Merge branch 'curl-openssl' into file-download-verify 34567df file(DOWNLOAD): Generalize EXPECTED_MD5 to EXPECTED_HASH
| * | | | | Utilities/Release: Enable CMAKE_USE_OPENSSL in nightly binariesBill Hoffman2012-09-114-0/+13
| | | | | |
| * | | | | file(DOWNLOAD): Add options for SSLBill Hoffman2012-09-112-1/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the ability to request that downloads disable or enable Certificate Authority checking with https ssl downloads. When the option to verify the servers CA is disabled, one may verify download contents with SHA hashes.
| * | | | | Merge branch 'curl-openssl' into file-download-verifyBrad King2012-09-115-19/+38
| |\ \ \ \ \
| * | | | | | file(DOWNLOAD): Generalize EXPECTED_MD5 to EXPECTED_HASHBill Hoffman2012-09-113-39/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for SHA algorithms.
* | | | | | | Merge topic 'FortranCrossCompiling3'Brad King2012-09-121-0/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7924aac CMakeDetermineFortranCompiler: add support for cross-compiling (#13379)
| * | | | | | | CMakeDetermineFortranCompiler: add support for cross-compiling (#13379)Alex Neundorf2012-09-111-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the same support code for cross compiling to CMakeDetermineFortranCompiler as there is already in the C and CXX versions of this file. Alex
* | | | | | | | CMake Nightly Date StampKitware Robot2012-09-121-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge topic 'curl-openssl'Brad King2012-09-115-19/+38
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b51762 curl: Honor OPENSSL_NO_SSL2 bc0e8c2 curl: Make OpenSSL DLLs available to CMake on Windows c2f4759 curl: Use find_package(OpenSSL)
| * | | | | | curl: Honor OPENSSL_NO_SSL2Brad King2012-09-073-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some OpenSSL distributions have dropped support for the ancient SSLv2 protocol completely. Port changes from upstream curl to recognize this case and avoid using it.
| * | | | | | curl: Make OpenSSL DLLs available to CMake on WindowsBill Hoffman2012-09-071-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Find the OpenSSL runtime DLLs and place them next to the CMake executables in the build tree and the install tree.
| * | | | | | curl: Use find_package(OpenSSL)Bill Hoffman2012-09-072-15/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change the code to use the standard CMake FindOpenSSL instead of the handcrafted attempt that was there before.
* | | | | | Merge topic 'CPackRPM_handleAttrDirectiveProperly-reloaded'Brad King2012-09-111-4/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8a1dd5 Handles %attr(nnn,-,-) /path/to/file in CPACK_RPM_USER_FILELIST properly.
| * | | | | | Handles %attr(nnn,-,-) /path/to/file in CPACK_RPM_USER_FILELIST properly.Eric NOULARD2012-09-101-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This triggered an unknown secondary bug when there is no ABSOLUTE INSTALL file. This is fixed as well. This is based on a fix of bug #0013468 from Viktor Dubrovsky.
* | | | | | | Merge topic 'docbook-validate'Brad King2012-09-1138-106/+14604
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d0c863f docbook: Fix Sun CC warning on ptr_fun(isalnum) 4e62784 docbook: Fix formatter naming convention to avoid shadow 9ad85dbb docbook: Remove redundant docs that cause invalid DocBook 9468b41 docbook: Add CMake.DocBook test to validate xml (#13508) 3a9e373 docbook: Add support for <abstract> at section level 1 67e7d49 docbook: Cleanup formatter and generated DocBook 55146ed docbook: Fix the DocBook section output dbfe335 docbook: Factor out code to write valid DocBook IDs cffa899 docbook: Remove table of contents ac25bc0 Utilities/xml: Add docbook-4.5 DTD (#13508) 2b2e86f Utilities/xml: Add .gitattributes to disable whitespace checks
| * | | | | | | docbook: Fix Sun CC warning on ptr_fun(isalnum)Brad King2012-09-101-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Sun compiler complains: cmDocumentationFormatterDocbook.cxx", line 230: Warning (Anachronism), badargtype2w: Formal argument x of type int(*)(int) in call to std::ptr_fun<int, int>(int(*)(int)) is being passed extern "C" int(*)(int). Add an intermediate C++ function to forward to the C function.
| * | | | | | | docbook: Fix formatter naming convention to avoid shadowBrad King2012-09-092-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some compilers complain: cmDocumentationFormatterDocbook.cxx: In member function virtual void cmDocumentationFormatterDocbook::PrintHeader(const char*, const char*, std::ostream&): cmDocumentationFormatterDocbook.cxx:197:73: warning: declaration of docname shadows a member of 'this' [-Wshadow] Fix the name of the member variable.
| * | | | | | | docbook: Remove redundant docs that cause invalid DocBookDaniel Pfeifer2012-09-081-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a subsection with a title is added, all subsequent subsections need a title too. The "helpful links" just repeat preceding subsections anyway.
| * | | | | | | docbook: Add CMake.DocBook test to validate xml (#13508)Daniel Pfeifer2012-09-081-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DocBook DTD is provided in "Utilities/xml/docbook-4.5".
| * | | | | | | docbook: Add support for <abstract> at section level 1Daniel Pfeifer2012-09-081-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a section has subsections (ie. subelemens with a title), all elements before the first title are written inside an <abstract>. Also wrap <programlisting> in <para>, to allow preformatted output in abstracts.
| * | | | | | | docbook: Cleanup formatter and generated DocBookDaniel Pfeifer2012-09-071-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comment and whitespace changes, changed docbook version to 4.5, changed <literallayout> to <programlisting> (the latter implies a fixed-size font).
| * | | | | | | docbook: Fix the DocBook section outputDaniel Pfeifer2012-09-071-24/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DocBook formatter used to generate something like: <para id="section"><sect2><title>Title</title></sect2>Some Text</para> Which was completely wrong. In DocBook, a section should look like this: <sect2 id="section"><title>Title</title><para>Some Text</para></sect2>
| * | | | | | | docbook: Factor out code to write valid DocBook IDsDaniel Pfeifer2012-09-072-37/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attributes in XML may contain alphanumeric characters, underscores, colons and dots. When DocBook is chunked, the dot is often used as a path separator. To generate a valid ID, we take the title of the section, transform all non-alphanumeric characters to underscores and then add a prefix separated with dots. We also add the document name as a prefix, in order to 'xinclude' eg. cmake.docbook and ctest.docbook in the same document. IDs are written in multiple places, so the code is factored to a function.
| * | | | | | | docbook: Remove table of contentsDaniel Pfeifer2012-09-071-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When DocBook is transformed (eg. to PDF, HTML, ...), a TOC is generated from the document's layout. The TOC-like list that the docbook formatter used to generate was both redundant and invalid.
| * | | | | | | Utilities/xml: Add docbook-4.5 DTD (#13508)Brad King2012-09-0733-0/+14494
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the shell code below to put the DTD in Utilities/xml/docbook-4.5: v=4.5 && sha1=b9124233b50668fb508773aa2b3ebc631d7c1620 && mkdir Utilities/xml/docbook-$v && cd Utilities/xml/docbook-$v && wget -c http://www.oasis-open.org/docbook/xml/$v/docbook-xml-$v.zip && sha1sum docbook-xml-$v.zip |grep $sha1 && unzip docbook-xml-$v.zip && rm docbook-xml-$v.zip