summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* FindBoost: Clarify example static libs option (#13663)Brad King2013-11-011-2/+2
| | | | State explicitly in the example that it will only find static libraries.
* FindBoost: Refine .rst formattingBrad King2013-11-011-32/+11
| | | | | Move the '::' starting literal blocks to the end of the preceding paragraph. Convert the "Boost CMake" divider to a section header.
* Merge topic 'add-CMAKE_FIND_NO_INSTALL_PREFIX'Brad King2013-11-012-9/+18
|\ | | | | | | | | fe057ab Allow disabling adding the install prefix to the prefix search path.
| * Allow disabling adding the install prefix to the prefix search path.Stephen Kelly2013-10-312-9/+18
| | | | | | | | | | | | | | In certain scenarios, it is preferable to keep a 'dirty' install prefix than to clear it, and to expect that content will not be found there. Add a CMAKE_FIND_NO_INSTALL_PREFIX variable that can be set to disable searching the install prefix.
* | Merge topic 'external-language-compiler-id'Brad King2013-10-291-1/+3
|\ \ | |/ |/| | | | | e65c788 CMakeDetermineCompilerId: Load src from CMAKE_MODULE_PATH (#14481)
| * CMakeDetermineCompilerId: Load src from CMAKE_MODULE_PATH (#14481)Dragos Carp2013-10-281-1/+3
| | | | | | | | Support new languages using CMAKE_MODULE_PATH.
* | Merge topic 'Qt-auto-generators'Brad King2013-10-281-0/+10
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c87d9c Add automatic rcc invocation for Qt. 84218e1 Add automatic uic invocation for Qt. 94a0ca6 Record which files are skipped by automoc. 18fb758 Run the main executable created in the autogen tests. e485ba1 Rename the QtAutomoc tests to QtAutogen. 7ce65c3 Add extra checks for the AUTOMOC target property. 32771fc Update output messages for generic use. f371ab5 Rename RunAutomoc to RunAutogen. 85b3d6e Extract an SetupAutoMocTarget method. ca124a1 Rename the AutomocInfo.cmake file to be more generic. a342c9f Move some makefile definitions up away from moc-specific code. 98632ef Add the AUTOGEN_TARGETS_FOLDER and obsolete AUTOMOC_TARGETS_FOLDER. 63378ba Rename some variables to reflect broader scope. 97f1aa3 Rename method to reflect generic use. 4abb111 Rename local variable to reflect generic use. 03878c9 Move variable set to where it is used. ...
| * Add automatic rcc invocation for Qt.Stephen Kelly2013-10-241-0/+4
| | | | | | | | | | This replaces the need to invoke qt4_add_resources by allowing adding the source .qrc file directly to the target sources.
| * Add automatic uic invocation for Qt.Stephen Kelly2013-10-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | The source files are already processed by cmQtAutomoc to look for moc includes, so extend that to also look for ui_ includes and find corresponding .ui files to process. This replaces the need to invoke qt4_wrap_ui(). As the ui files are not likely to be part of the SOURCES of the target, store the options associated with them separately in the cmMakefile for querying during the autogen run.
| * Record which files are skipped by automoc.Stephen Kelly2013-10-241-0/+1
| | | | | | | | They may not be skipped by autouic.
| * Rename the AutomocInfo.cmake file to be more generic.Stephen Kelly2013-10-241-0/+0
| |
* | Merge topic 'enable-language-require-compiler'Brad King2013-10-287-10/+10
|\ \ | | | | | | | | | | | | | | | | | | 3e04946 Require CMAKE_<LANG>_COMPILER to be found as a full path 6007f7c CMakeDetermineCompilerId: Always use compiler detected from IDE 332771c CMakeDetermine*Compiler: Remove temporary cache entry
| * | Require CMAKE_<LANG>_COMPILER to be found as a full pathBrad King2013-10-282-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All generators now support detection of the full path to the compiler, so require it to be so. This will allow CMake<LANG>Information.cmake and other logic to assume the full path to the compiler tool is available. The Makefile generators already rejected CMAKE_<LANG>_COMPILER values that did not name an existing compiler. Extend this error message to all generators, make it occur as early as possible, and improve the message with advice about how to set the compiler. If the full path to the compiler is not known, finish enabling languages with a fatal error so configuration does not continue. For now, allow the RC language compiler to not be a full path. Later we will need to detect the full path to "rc" under the VS IDE. Add a RunCMake.CompilerNotFound test to cover failure cases. Fix the RunCMake.CompilerChange test EmptyCompiler case to work when configuration does not continue past enable_language.
| * | CMakeDetermineCompilerId: Always use compiler detected from IDEBrad King2013-10-281-6/+4
| | | | | | | | | | | | | | | | | | | | | When compiler id detection also provides a CMAKE_<LANG>_COMPILER value, use it unconditionally. It is known to be the compiler that is actually in use by IDE builds in VS and Xcode. Do not let a stray cache entry try to say otherwise.
| * | CMakeDetermine*Compiler: Remove temporary cache entryBrad King2013-10-244-4/+4
| |/ | | | | | | | | | | | | | | When the user or toolchain file sets CMAKE_<LANG>_COMPILER to a name without a path we use find_program with CMAKE_<LANG>_COMPILER_WITH_PATH to search for the tool. Remove the temporary cache entry afterward to avoid exposing it to projects. It is not set by other logic paths so no one should be using it.
* | Merge topic 'ninja-use-deps'Brad King2013-10-285-6/+8
|\ \ | | | | | | | | | | | | eeb4aec Ninja: use deps = gcc/msvc feature
| * | Ninja: use deps = gcc/msvc featurePeter Kümmel2013-10-245-6/+8
| | | | | | | | | | | | cmcldeps is now only used for .rc file processing
* | | 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.