summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FixIssue14029'Brad King2013-11-226-7/+37
|\ | | | | | | | | 9619719 FindSDL: Add additional search paths on MSVC (#14029)
| * FindSDL: Add additional search paths on MSVC (#14029)Benjamin Eikel2013-11-216-7/+37
| | | | | | | | | | | | | | | | Add an architecture-specific library directory path suffix for each component. Use different search path for SDL_sound. Project files in VisualC directory suggest that a win32lib will hold the libraries. Reported-by: Paul Hampson <Paul.Hampson@Pobox.com>
* | Merge topic 'cross-compiling-toolchain-variables'Brad King2013-11-222-0/+17
|\ \ | | | | | | | | | | | | 7521da2 Introduce CMAKE_STAGING_PREFIX variable.
| * | Introduce CMAKE_STAGING_PREFIX variable.Stephen Kelly2013-11-212-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable can be useful in cross-compiling contexts where the sysroot is read-only or where the sysroot should otherwise remain pristine. If the new CMAKE_STAGING_PREFIX variable is set, it is used instead of CMAKE_INSTALL_PREFIX when generating the installation rules in cmake_install.cmake. This way, the CMAKE_INSTALL_PREFIX variable always refers to the installation prefix on the target device, regardless of whether host==target. If any -rpath paths passed to the linker contain the CMAKE_STAGING_PREFIX, the matching path fragments are replaced with the CMAKE_INSTALL_PREFIX. Matching paths in the -rpath-link are not transformed. The cross-prefix usr-move workaround is assumed not to require extension regarding CMAKE_STAGING_PREFIX. The staging area is a single prefix, so there is no scope for cross-prefix symlinks. The CMAKE_INSTALL_PREFIX is still used to determine the workaround path, and that variable remains the relevant one even if CMAKE_STAGING_PREFIX is used. If the generated export files are deployed to the target, the workaround will still be in place, and still be employed if required.
* | | Merge topic 'FindwxWidgets-3.0.0'Brad King2013-11-211-0/+6
|\ \ \ | | | | | | | | | | | | | | | | 2cd5597 FindwxWidgets: Add support for wxWidgets 3.0.0 (#14587)
| * | | FindwxWidgets: Add support for wxWidgets 3.0.0 (#14587)Arnaud Desmier2013-11-201-0/+6
| | | | | | | | | | | | | | | | | | | | Add the "wxWidgets-3.0.0" path suffix and the "30" library names. While at it, add the "wxWidgets-2.9.5" suffix too.
* | | | Merge topic 'find_backtrace'Brad King2013-11-211-0/+91
|\ \ \ \ | |/ / / |/| | | | | | | | | | | c6f339c Add FindBacktrace.cmake module.
| * | | Add FindBacktrace.cmake module.Vadim Zhukov2013-10-161-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It designed to search for implementation of backtrace(3) routine. Currently it is used in OpenBSD Ports for building Clementine music player. A lot of input from brad.king@ and neundorf@.
* | | | Merge topic 'add-missing-parent-group'Brad King2013-11-201-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2751b93 CPackComponent: handle the documented PARENT_GROUP parameter
| * | | | CPackComponent: handle the documented PARENT_GROUP parameterNils Gladitz2013-11-191-1/+1
| | | | |
* | | | | Merge topic 'FindLATEX-ps2pdf'Brad King2013-11-201-1/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | 0767474 FindLATEX: Find ps2pdf with MikTeX.
| * | | | FindLATEX: Find ps2pdf with MikTeX.Matt McCormick2013-10-241-1/+2
| | | | |
* | | | | Merge topic 'cross-compiling-toolchain-variables'Brad King2013-11-197-2/+25
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7cd65c9 Add CMAKE_SYSROOT variable to set --sysroot when cross compiling. 5096967 Allow toolchain files to specify an external toolchain. 76552d5 Add compiler target compile options. f41ecd1 CMakeDetermineCompilerId: Look for internal file only on host
| * | | | Add CMAKE_SYSROOT variable to set --sysroot when cross compiling.Stephen Kelly2013-11-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As CMAKE_ROOT_FIND_PATH can be a list, a new CMAKE_SYSROOT is introduced, which is never a list. The contents of this variable is passed to supporting compilers as --sysroot. It is also accounted for when processing implicit link directories reported by the compiler, and when generating RPATH information.
| * | | | Allow toolchain files to specify an external toolchain.Stephen Kelly2013-11-192-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang can compile code, but uses the gcc tools for other tasks such as linking. The -gcc-toolchain option can be used for that, but generalize so that other compilers can be treated the same. If such a location is specified, use it as a hint for finding the binutils executables.
| * | | | Add compiler target compile options.Stephen Kelly2013-11-194-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For clang, this allows passing -target <triple> to the compiler, and for qcc, -V<arch> using toolchain files containing something like set(triple arm-linux-gnueabihf) set(CMAKE_C_COMPILER "/usr/bin/clang") set(CMAKE_C_COMPILER_TARGET ${triple}) set(CMAKE_CXX_COMPILER "/usr/bin/clang++") set(CMAKE_CXX_COMPILER_TARGET ${triple}) or set(arch gcc_ntoarmv7le) set(CMAKE_C_COMPILER /opt/qnx650/host/linux/x86/usr/bin/qcc) set(CMAKE_C_COMPILER_TARGET ${arch}) set(CMAKE_CXX_COMPILER /opt/qnx650/host/linux/x86/usr/bin/QCC) set(CMAKE_CXX_COMPILER_TARGET ${arch}) Both clang and qcc are inherently cross compiler( driver)s. When cross-compiling with clang, use the CMAKE_${lang}_COMPILER_TARGET as the _CMAKE_TOOLCHAIN_PREFIX to find the appropriate binutils. When cross-compiling with QNX qcc, use the CMAKE_${lang}_COMPILER_TARGET to set the appropriate _CMAKE_TOOLCHAIN_PREFIX.
| * | | | CMakeDetermineCompilerId: Look for internal file only on hostStephen Kelly2013-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The find_file this module uses to locate the compiler id source file must always look on the host and never in CMAKE_FIND_ROOT_PATH, even when a toolchain file has set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) Add NO_CMAKE_FIND_ROOT_PATH to the find_file call to avoid rerooting.
* | | | | Merge topic 'cleanup-build-commands'Brad King2013-11-1911-289/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4cce44b Help: Document the CMAKE_MAKE_PROGRAM variable in more detail 558c74d VS: Switch to internal CMAKE_MAKE_PROGRAM lookup by generators 5229f2d Tests: Do not use an explicit make program for VS generators 72dd738 Tests: Fix MFC test heuristic for empty CMAKE_TEST_MAKEPROGRAM fd6076d Tests: Pass CMAKE_MAKE_PROGRAM instead of --build-makeprogram 68031ab Tests: Configure SubProject-Stage2 test more robustly 003d10c Tests: Simplify VSExcludeFromDefaultBuild configuration e47d934 Tests: Simplify VSProjectInSubdir configuration e965cb1 Tests: Simplify CTest.BuildCommand.ProjectInSubdir configuration 72bf255 Tests: Pass --build-options to every test 4d1d772 ctest: Teach --build-options to allow zero options 96966b5 ctest: Make the --build-makeprogram optional for --build-and-test 91a0211 Simplify some calls to cmGlobalGenerator::Build 123a060 Teach GenerateBuildCommand to find its own make program 5f5c92b VS: Add internal APIs to find MSBuild, devenv/VCExpress, and msdev 4ac75fd Prefer CMAKE_MAKE_PROGRAM over CMAKE_BUILD_TOOL (#14548) ...
| * | | | | VS: Switch to internal CMAKE_MAKE_PROGRAM lookup by generatorsBrad King2013-11-188-283/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the "Modules/CMakeVS*FindMake.cmake" files. Override the cmGlobalGenerator::FindMakeProgram method for VS generators to use their internal APIs to locate the build tool. Set the CMAKE_MAKE_PROGRAM as a normal variable for use by project code, but do not cache it. This will allow CMake and CTest to select the proper tool at build time.
| * | | | | 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 'doc-ExternalProject-formatting'Brad King2013-11-191-70/+59
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 01ecd24 ExternalProject: Format module documentation
| * | | | | ExternalProject: Format module documentationBrad King2013-11-191-70/+59
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | CPack: don't write internal variables to CPackConfig.cmakeNils Gladitz2013-11-171-31/+31
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The internal variables CPACK_ADDCOMP_COMPONENTS, CPACK_ADDCOMP_STR and CPACK_ADDCOMP_UNAME were being needlessly exported to CPackConfig.cmake. Prefixing them with an underscore prevents this. CPACK_ADDCOMP_STR was particularily problematic since it contains unescaped quotes.
* | | | 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.
generated by cgit v0.12 at 2025-01-06 21:17:35 (GMT)