summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Prefer CMAKE_MAKE_PROGRAM over CMAKE_BUILD_TOOL (#14548)Brad King2013-11-183-6/+3
| | | | | | | | | | | | | Historically these were both added for the Makefile and Visual Studio generators, respectively. Later the VS generators started using the CMAKE_MAKE_PROGRAM cache entry to find the IDE build tool, and the CMAKE_BUILD_TOOL was simply set as an alias. Fix the documentation to explain that CMAKE_MAKE_PROGRAM is the modern variable and that CMAKE_BUILD_TOOL is the compatibility alias, not the other way around. Replace uses of CMAKE_BUILD_TOOL with CMAKE_MAKE_PROGRAM in CMake-provided modules. Nothing needs to lookup CMAKE_BUILD_TOOL in the cache, so simply set it as a normal variable.
* Merge topic 'gp-ld_library_path'Brad King2013-11-141-2/+4
|\ | | | | | | | | e130b9e GetPrerequisites: Preserve search path order from caller.
| * GetPrerequisites: Preserve search path order from caller.Clinton Stimpson2013-11-141-2/+4
| |
* | Merge topic 'openmp-cray'Brad King2013-11-141-4/+5
|\ \ | | | | | | | | | | | | ebf70b0 FindOpenMP: fix detecting compilers that do not need any special flag (#14567)
| * | FindOpenMP: fix detecting compilers that do not need any special flag (#14567)Rolf Eike Beer2013-11-131-4/+5
| | |
| * | Merge branch 'vs12-parallel-cl-FS' into releaseBrad King2013-11-023-1/+7
| |\ \
* | \ \ Merge topic 'configure_file-drop-IMMEDIATE'Brad King2013-11-1418-20/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 15610bb Drop use of configure_file IMMEDIATE option
| * | | | Drop use of configure_file IMMEDIATE optionDaniele E. Domenichelli2013-11-1318-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 7d47c693 (Drop compatibility with CMake < 2.4, 2013-10-08) we no longer need to use the configure_file IMMEDIATE option to support compatibility modes less than 2.0.
* | | | | ExternalData: Allow local stores without any URL templatesBrad King2013-11-131-5/+10
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow ExternalData_URL_TEMPLATES to be empty if a value for ExternalData_OBJECT_STORES is provided. Assume in this use case that the object stores will already contain all needed objects. Extend the Module.ExternalData test to cover this case (all objects in stores). Extend the RunCMake.ExternalData test to cover the non-failure message case when stores are provided without URL templates.
* | | | Merge topic 'doc-ExternalData-network-path'Brad King2013-11-131-107/+99
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | f3883f3 ExternalData: Show example network path URL template ff6818b ExternalData: Format module documentation
| * | | | ExternalData: Show example network path URL templateBrad King2013-11-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | In the ExternalData_URL_TEMPLATES example, add an entry showing how to use the "file://" protocol with a network filesystem path.
| * | | | ExternalData: Format module documentationBrad King2013-11-121-107/+98
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually revise the .rst format of the documentation. Use inline literal quotes appropriately in paragraph text. Move the :: literal block openers to the end of the preceding paragraphs. Convert the command signature documentation and examples to cmake code-block directives.
* | | | CPackWiX: Add variables for custom tool extensions and flagsNils Gladitz2013-11-121-1/+23
|/ / /
* | | Merge topic 'osx-no-PackageMaker'Brad King2013-11-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 7947981 CPack: Disable OS X PackageMaker by default (#13662)
| * | | CPack: Disable OS X PackageMaker by default (#13662)Brad King2013-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As mentioned in commit 4693cf84 (Xcode: Detect new default locations of Xcode 4.3 bits and pieces) PackageMaker was split out of Xcode 4.3 and above into a separate Auxiliary tools package. Since Xcode 5.0 or so, Apple no longer distributes PackageMaker as part of the available development tools so it can only be obtained from old packages. Disable the CPACK_BINARY_PACKAGEMAKER option by default as is the case for most other tool-dependent generators.
* | | | Merge topic 'FindPHP4-no-cache-output'Brad King2013-11-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | a06debc FindPHP4: Drop extra content from reported PHP4_INCLUDE_PATH (#14540)
| * | | | FindPHP4: Drop extra content from reported PHP4_INCLUDE_PATH (#14540)Brad King2013-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The set() call for this variable left out the CACHE keyword. It does not need to be cached anyway, so drop the other CACHE set() signature arguments. Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=722475 Reported-by: Modestas Vainius <modax@debian.org> Inspired-by: Mathieu Malaterre <malat@debian.org>
* | | | | Merge topic 'FindJNI-biarch'Brad King2013-11-051-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cde56c1 FindJNI: Support biarch installations (#14541)
| * | | | | FindJNI: Support biarch installations (#14541)Modestas Vainius2013-11-041-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On biarch architecture, CMAKE_SYSTEM_PROCESSOR might be a 64bit one while the system 32bit one. Take this into consideration while looking for Java library directory. Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718290
* | | | | Merge topic 'ninja-deps-intel'Brad King2013-11-052-0/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | d439083 Ninja: add depfile support for Intel's compiler
| * | | | Ninja: add depfile support for Intel's compilerPeter Kümmel2013-11-042-0/+4
| | | | |
* | | | | Merge topic 'cpack-drag-n-drop-rez'Brad King2013-11-041-0/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | 53d6ebb cpack: For DragNDrop generator, add sysroot option when calling Rez. 193029c cpack: For DragNDrop generator, add sysroot option when calling Rez.
| * | | | cpack: For DragNDrop generator, add sysroot option when calling Rez.Clinton Stimpson2013-11-011-2/+2
| | | | |
| * | | | cpack: For DragNDrop generator, add sysroot option when calling Rez.Clinton Stimpson2013-11-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adding overwrite option (-ov) in case multiple temporary dmg files are being created. Fixes bug #14536.
* | | | | 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)
generated by cgit v0.12 at 2024-11-14 03:22:44 (GMT)