summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Fix CMAKE_(C|CXX|Fortran)_STANDARD_LIBRARIES helpstrings (#14622)Brad King2013-12-033-3/+3
| | | | | | s/defalut/default/ Reported-by: Stephan Tolksdorf <st@quanttec.com>
* Make CMAKE_(C|CXX|Fortran)_<CONFIG> help strings more consistent (#14606)Brad King2013-12-023-6/+6
| | | | | Use consistent capitalization and write all words out in the cache entry descriptions.
* Fix CMAKE_(C|CXX|Fortran)_RELEASE helpstrings (#14606)Brad King2013-12-023-3/+3
| | | | | Remove the platform-specific description from the cache entry help strings for these variables.
* Merge topic 'cross-compiling-toolchain-variables'Brad King2013-11-261-2/+7
|\ | | | | | | | | 89ba7b0 Update the Clang pattern to specify compiler options.
| * Update the Clang pattern to specify compiler options.Stephen Kelly2013-11-251-2/+7
| | | | | | | | | | | | | | | | | | | | In Clang 3.4, the preferred (and new) option pattern is --target=. http://thread.gmane.org/gmane.comp.compilers.clang.devel/29975 http://llvm.org/viewvc/llvm-project?view=revision&revision=184408 Clang 3.4 is not yet released, but there is a release candidate, and there is a dashboard test of Clang trunk.
* | Merge topic 'UseSWIG-fix14520'Brad King2013-11-261-0/+1
|\ \ | | | | | | | | | | | | 20028d6 UseSWIG: Remove duplicate include dirs (#14520)
| * | UseSWIG: Remove duplicate include dirs (#14520)Julien Schueller2013-11-251-0/+1
| | | | | | | | | | | | Shorten the swig command line.
* | | Merge topic 'UseSWIG-fix13814'Brad King2013-11-261-0/+4
|\ \ \ | | | | | | | | | | | | | | | | acc59e5 UseSWIG: Handle a dll name different than module name (#13814)
| * | | UseSWIG: Handle a dll name different than module name (#13814)Julien Schueller2013-11-251-0/+4
| |/ /
* | | Merge topic 'FindGTK2-quartz-backend'Brad King2013-11-261-2/+12
|\ \ \ | |_|/ |/| | | | | | | | 0e9bf6a FindGTK2: Add support for Quartz backend on MAC
| * | FindGTK2: Add support for Quartz backend on MACDaniele E. Domenichelli2013-11-241-2/+12
| |/ | | | | | | Fix issue #14593
* | Merge topic 'EclipseParallelMakeOnlyOnUnixHosts'Brad King2013-11-251-1/+1
|\ \ | | | | | | | | | | | | 83751af Eclipse: add -j only on UNIX hosts
| * | Eclipse: add -j only on UNIX hostsAlex Neundorf2013-11-231-1/+1
| |/ | | | | | | | | | | | | | | | | | | The previous version added -jN to the make invokation if UNIX was set, but this was true also when cross compiling. What we are actually interested in is CMAKE_HOST_UNIX, i.e. whether the build host is UNIX. Or we should check more exactly what CMAKE_MAKE_PROGRAM is. Alex
* | Merge topic 'UseSWIG-fix13772'Brad King2013-11-251-30/+2
|\ \ | | | | | | | | | | | | 276e373 UseSWIG: Fix .i relative source file location (#13173,#13772,#14459)
| * | UseSWIG: Fix .i relative source file location (#13173,#13772,#14459)Julien Schueller2013-11-251-30/+2
| |/
* | Merge topic 'FindSWIG-fix13771'Brad King2013-11-251-1/+1
|\ \ | | | | | | | | | | | | 8c127c9 FindSWIG: Use CMAKE_CURRENT_LIST_DIR instead of CMAKE_ROOT (#13771)
| * | FindSWIG: Use CMAKE_CURRENT_LIST_DIR instead of CMAKE_ROOT (#13771)Julien Schueller2013-11-221-1/+1
| | | | | | | | | | | | This is a simpler way to reference the location of UseSWIG.cmake.
* | | Merge topic 'FindSWIG-fix13449'Brad King2013-11-251-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 19b7a54 FindSWIG: Search for swig.swg only on host (#13449)
| * | | FindSWIG: Search for swig.swg only on host (#13449)Julien Schueller2013-11-221-1/+1
| |/ / | | | | | | | | | | | | Use NO_CMAKE_FIND_ROOT_PATH to ensure swig.swg can be found on the host even when cross-compiling.
* | | Merge topic 'FindSWIG-fix13426'Brad King2013-11-251-0/+2
|\ \ \ | |_|/ |/| | | | | | | | 6620dc7 FindSWIG: Mark SWIG_DIR & SWIG_VERSION as advanced (#13426)
| * | FindSWIG: Mark SWIG_DIR & SWIG_VERSION as advanced (#13426)Julien Schueller2013-11-221-0/+2
| |/
* | 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