summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ctest-p4'Brad King2013-10-262-0/+12
|\ | | | | | | | | 970c823 ctest_update: Add support for Perforce p4 client
| * ctest_update: Add support for Perforce p4 clientPedro Navarro2013-10-262-0/+12
| | | | | | | | | | | | | | | | | | | | | | Teach the ctest_update implementation to use the p4 command-line client to perform updates and extract the list of changes. Add a CTest.UpdateP4 test like those that exist already for the other version control tools. Make the test available when p4 and the p4d server are found. During the test launch p4d in the background to serve a repository from the test directory. Then direct the client toward this server for the duration of the test.
* | Merge topic 'clang-binutils'Brad King2013-10-262-4/+4
|\ \ | | | | | | | | | | | | b84f5c2 Find appropriate binutils when cross-compiling with clang
| * | Find appropriate binutils when cross-compiling with clangStephen Kelly2013-10-252-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One way to use clang as a cross-compiler is to create a symlink named <target>-clang, which is equivalent to running clang -target <target> Extract the toolchain prefix to find the binutils executables.
* | | Merge topic 'QNX-ninja-generator'Brad King2013-10-261-0/+3
|\ \ \ | | | | | | | | | | | | | | | | 02cf77f QNX: Don't attempt to create depfiles
| * | | QNX: Don't attempt to create depfilesStephen Kelly2013-10-251-0/+3
| |/ / | | | | | | | | | | | | The qcc driver can not handle the flags. This makes it possible to use qcc with the Ninja generator.
* | | Merge topic 'python-interp-remove-debug-messages'Brad King2013-10-261-2/+0
|\ \ \ | | | | | | | | | | | | | | | | 49c4699 python: remove debug statements from FindPythonInterp.cmake.
| * | | python: remove debug statements from FindPythonInterp.cmake.Clinton Stimpson2013-10-241-2/+0
| |/ /
* | | Merge topic 'intel-no-i_dynamic'Brad King2013-10-261-2/+2
|\ \ \ | | | | | | | | | | | | | | | | f61bcbc Intel: Drop deprecated -i_dynamic flag from Fortran (#14507)
| * | | Intel: Drop deprecated -i_dynamic flag from Fortran (#14507)Brad King2013-10-241-2/+2
| |/ / | | | | | | | | | | | | | | | | | | The -i_dynamic flag is deprecated and not even listed in the manual for Intel Composer XE 2013. Reported-by: Izaak Beekman <zbeekman@gmail.com>
* | | Merge topic 'FindCUDA-arm-5.5'Brad King2013-10-261-8/+40
|\ \ \ | | | | | | | | | | | | | | | | ef02c9e added support for arm cross compilation with CUDA 5.5:
| * | | added support for arm cross compilation with CUDA 5.5:Vladislav Vinogradov2013-10-241-8/+40
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | * added CUDA_TOOLKIT_TARGET_DIR CMake variable that used to locate headers and libraries for target platform * added CUDA_TARGET_CPU_ARCH which is set to ARM for arm cross-compilation and is used to add --target-cpu-architecture NVCC flag
* | | Merge topic 'qt4-svg-dep'Brad King2013-10-261-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 656716d qt4: Fix linking with QtSvg to not include QtXml.
| * | | qt4: Fix linking with QtSvg to not include QtXml.Clinton Stimpson2013-10-231-1/+1
| |/ / | | | | | | | | | Fixes issue #14505.
* | | Drop compatibility with CMake < 2.4Brad King2013-10-232-11/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | Drop all behavior activated by setting CMAKE_BACKWARDS_COMPATIBILITY to a value lower than 2.4, and generate an error when projects or the user attempt to do so. In the error suggest using a CMake 2.8.x release. Teach cmake_minimum_required to warn about projects that do not require at least CMake 2.4. They are not supported by CMake >= 3.0. Replace the documentation of CMAKE_BACKWARDS_COMPATIBILITY with a reference to policy CMP0001.
* | Merge topic 'FindJava-msg'Brad King2013-10-231-1/+1
|\ \ | | | | | | | | | | | | c832299 FindJava: fix message output (#14502)
| * | FindJava: fix message output (#14502)Rolf Eike Beer2013-10-221-1/+1
| |/
* | Merge topic 'vs-graceful-empty-compiler'Brad King2013-10-234-7/+7
|\ \ | | | | | | | | | | | | | | | 705ae00 Quote ${CMAKE_<LANG>_COMPILER} while enabling a language 18a2537 CMakeDetermineCompilerId: Do not test vendor without a compiler
| * | Quote ${CMAKE_<LANG>_COMPILER} while enabling a languageBrad King2013-10-224-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though this variable gets set to CMAKE_<LANG>_COMPILER-NOTFOUND when the compiler is not found, CMake<LANG>Compiler.cmake gets removed by cmGlobalGenerator::EnableLanguage so in try compiles the value is empty. Quote references to the variable in Modules/CMake(C|CXX|Fortran)Information.cmake Modules/CMakeDetermineCompilerId.cmake to avoid dropping arguments from commands that expect them.
| * | CMakeDetermineCompilerId: Do not test vendor without a compilerBrad King2013-10-221-1/+1
| |/ | | | | | | | | If no CMAKE_${lang}_COMPILER is available then do not try to run it to determine the compiler vendor.
* | Merge topic 'doc-cmake-developer'Brad King2013-10-231-189/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | e0ce6f0 cmRST: Cross-reference cmake-developer.7 manual and cmRST Doxygen c1c239b Help: Add documentation format to cmake-developer.7 manual a06a90f Help: Organize cmake-developer.7 manual Modules section 28f08ba Help: Fix module documentation markup in cmake-developer.7 manual baaab06 Help: Move Modules/readme.txt content into cmake-developer.7 manual 80a311e Help: Add cmake-developer.7 manual
| * | Help: Organize cmake-developer.7 manual Modules sectionBrad King2013-10-221-1/+3
| | | | | | | | | | | | | | | | | | Add "Module Documentation" and "Find Modules" subsections. Add to Modules/readme.txt a textual reference to the cmake-developer.7 manual and, while at it, fix the wiki URL domain.
| * | Help: Move Modules/readme.txt content into cmake-developer.7 manualKitware Robot2013-10-221-188/+0
| |/ | | | | | | | | | | | | Move all content from Modules/readme.txt except for the link to the module maintainers wiki page into "Help/manual/cmake-developer.7.rst". This produces some invalid reStructuredText markup to be fixed in a future commit.
* | CheckTypeSize: Add support for C++Daniele E. Domenichelli2013-10-211-6/+43
|/ | | | | | | | | | | | | | Previously if headers required to check the size of a type can be compiled with C++ compiler only, the check would fail because the C compiler fails. As a consequence, HAVE_${VARIABLE} would be set to false, and ${VARIABLE} will be empty. Teach CHECK_TYPE_SIZE to accept a new optional argument LANGUAGE that allows one to explicitly set the compiler to use. The new signature is therefore: CHECK_TYPE_SIZE(TYPE VARIABLE [BUILTIN_TYPES_ONLY] [LANGUAGE <language>])
* Merge topic 'vs12-parallel-cl-FS'Brad King2013-10-213-1/+7
|\ | | | | | | | | 216afc8 MSVC: Add /FS flag for cl >= 18 to allow parallel compilation (#14492)
| * MSVC: Add /FS flag for cl >= 18 to allow parallel compilation (#14492)Brad King2013-10-183-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In generators such as Ninja that can run multiple "cl" processes that refer to the same compiler .pdb file (/Fd) at the same time, MSVC from Visual Studio 2013 complains: fatal error C1041: cannot open program database '.../vc120.pdb'; if multiple CL.EXE write to the same .PDB file, please use /FS According to "cl /?": /FS force to use MSPDBSRV.EXE Add the flag to compilation lines for this compiler version just after the /Fd option.
* | Merge topic 'vs-intel-compiler'Brad King2013-10-201-1/+5
|\ \ | | | | | | | | | | | | 1b7117a VS 6: Do not try Intel Fortran .vfproj file with msdev
| * | VS 6: Do not try Intel Fortran .vfproj file with msdevBrad King2013-10-191-1/+5
| | | | | | | | | | | | | | | | | | Teach CMakeDetermineCompilerId to skip trying to build a .vfproj file for Intel Fortran under Visual Studio 6. The msdev command-line build produces a popup error dialog that hangs the configuration.
* | | Merge topic 'vs-intel-compiler'Brad King2013-10-1811-99/+103
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | d14898b Intel: Fix detection of MSVC version simulated by pre-11.0 Fortran a85e17e Intel: When simulating MSVC, re-use Windows-MSVC (#14476) af40e8c VS: Detect Intel Fortran compiler id and version b8522a8 VS: Expose Intel Fortran .vfproj format version to CMake language 2d36c9a CMakeDetermineCompilerId: Fix Intel Fortran compiler id detection a6fd17c VS: Fix CMAKE_<LANG>_COMPILER detection with Intel toolset (#14471)
| * | Intel: Fix detection of MSVC version simulated by pre-11.0 FortranBrad King2013-10-181-3/+1
| | | | | | | | | | | | | | | | | | | | | The Intel Fortran 10 64-bit compiler incorrectly defines _MSC_VER to its own version (1020) instead of the underlying MSVC tools version. Since we expect the compiler to be used only with VS >= 7 tools, assume MSVC version 13.0 if _MSC_VER is not greater than 1300.
| * | Intel: When simulating MSVC, re-use Windows-MSVC (#14476)Brad King2013-10-188-93/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | Teach CMake(C|CXX|Fortran)CompilerId* to report the MSVC version simulated by the Intel compiler, if any. Refactor the Windows-Intel platform information helper module to load Windows-MSVC instead of duplicating the information. Teach Windows-MSVC to understand when it is loaded as the simulated Fortran compiler (its preprocessor is simulated).
| * | VS: Detect Intel Fortran compiler id and versionBrad King2013-10-183-5/+47
| | | | | | | | | | | | | | | | | | Teach CMakeDetermineCompilerId to use a .vfproj project file to build the Fortran compiler id source file under the Visual Studio generators.
| * | CMakeDetermineCompilerId: Fix Intel Fortran compiler id detectionBrad King2013-10-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Intel Fortran compiler needs the /fpp option to enable C preprocessing. Without the option the compiler may warn and ignore preprocessor lines instead of failing with an error. Detect the warning and treat it as failure so that we move on to try /fpp and detect the correct id. Without this it works only by luck because Intel is the first compiler id in our detection source file.
| * | VS: Fix CMAKE_<LANG>_COMPILER detection with Intel toolset (#14471)Brad King2013-10-161-0/+3
| | | | | | | | | | | | | | | When the platform toolset is from Intel, look for "icl.exe" instead of "cl.exe".
* | | Merge topic 'wix-documentation-escapes'Brad King2013-10-171-2/+2
|\ \ \ | | | | | | | | | | | | | | | | 42b4f6c CPackWiX: prevent attribute references in docs from being interpreted
| * | | CPackWiX: prevent attribute references in docs from being interpretedNils Gladitz2013-10-161-2/+2
| |/ /
* | | Qt4: make pro files generated for translations easier to readRolf Eike Beer2013-10-161-3/+4
|/ / | | | | | | | | -use one line for each input file and include directory -remove duplicate include directories
* | Modules/readme.txt: Update steps to add module documentationBrad King2013-10-161-23/+41
| | | | | | | | | | Replace the old module documentation instructions with steps to add reStructuredText documentation that will be built by Sphinx.
* | CPack: Replace #<type> markup with reStructuredText equivalentKitware Robot2013-10-1611-1188/+805
| | | | | | | | | | | | | | Drop #end and #module. Convert #section to a subsection header. Convert #variable to the cmake domain "variable" directive. Convert #macro to the cmake domain "command" directive. Perform minor formatting fixes in text near these changes.
* | Help: Fix reStructuredText syntax in auto-generated documentsBrad King2013-10-153-4/+1
| |
* | ExternalProject: Restore documentation indentation levelBrad King2013-10-151-70/+70
| | | | | | | | | | This module parses its own documentation to extract supported options. Fix the indentation level to match that expected by the parser.
* | Convert builtin help to reStructuredText source filesKitware Robot2013-10-15219-5865/+9684
| | | | | | | | | | | | | | | | Run the convert-help.bash script to convert documentation: ./convert-help.bash "/path/to/CMake-build/bin" Then remove it.
* | Merge topic 'wix-extra-sources'Brad King2013-10-151-0/+14
|\ \ | | | | | | | | | | | | 2e6cadd CPackWiX: allow user supplied extra sources, objects and libraries
| * | CPackWiX: allow user supplied extra sources, objects and librariesNils Gladitz2013-10-131-0/+14
| | |
* | | Merge topic 'FindCUDA-NPP-5.5'Brad King2013-10-151-1/+16
|\ \ \ | | | | | | | | | | | | | | | | 5076218 FindCUDA: Fix NPP library search for CUDA 5.5
| * | | FindCUDA: Fix NPP library search for CUDA 5.5Vladislav Vinogradov2013-10-111-1/+16
| | |/ | |/| | | | | | | In CUDA 5.5 NPP was divided onto 3 separate libraries: nppc, npps, nppi.
* | | OS X: Encode -F framework search flag in per-language platform variableBrad King2013-10-101-0/+5
| |/ |/| | | | | | | | | | | | | | | Compilers for languages other than C and C++ on OS X may not understand the -F framework search flag. Create a new platform information variable CMAKE_<LANG>_FRAMEWORK_SEARCH_FLAG to hold the flag, and set it for C and CXX lanugages in the Platform/Darwin module. Reported-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge topic 'deprecation-message'Brad King2013-10-092-27/+3
|\ \ | | | | | | | | | | | | | | | | | | f973737 GenerateExportHeader: Port to use message(DEPRECATION) f69606d Qt4Macros: Port to use message(DEPRECATION) 509c142 message: Add a DEPRECATION mode
| * | GenerateExportHeader: Port to use message(DEPRECATION)Stephen Kelly2013-10-081-9/+1
| | |
| * | Qt4Macros: Port to use message(DEPRECATION)Stephen Kelly2013-10-081-18/+2
| | |