summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fphsa-typo'Brad King2015-08-251-1/+1
|\ | | | | | | | | 64e527db FPHSA: fix typo in documentation
| * FPHSA: fix typo in documentationRolf Eike Beer2015-08-241-1/+1
| |
* | FindJNI: Add support for x32 architecture on Linux (#15710)Thorsten Glaser2015-08-241-0/+4
|/ | | | | This architecture uses an amd64 kernel but x32 userland. Use CMAKE_LIBRARY_ARCHITECTURE to distinguish it for now.
* Merge topic 'FindCUDA-vs2013-separate-compilation'Brad King2015-08-211-3/+2
|\ | | | | | | | | 9b2f6992 FindCUDA: Fix object build rule for separate compilation on VS 2013+ (#15697)
| * FindCUDA: Fix object build rule for separate compilation on VS 2013+ (#15697)Dominic Meiser2015-08-201-3/+2
| | | | | | | | | | | | The handling of multilevel dependencies has been fixed in Visual Studio 2013. The work around used for VS 2010 and VS 2012 does not work for VS 2013 any more. Switch to normal object build rules for VS 2013 and newer.
* | Merge topic 'sublime-msvc-includes'Brad King2015-08-211-0/+4
|\ \ | | | | | | | | | | | | c66835fc Extra Generator: Populate MSVC system include paths from environment (#15597)
| * | Extra Generator: Populate MSVC system include paths from environment (#15597)Gregor Jasny2015-08-181-0/+4
| |/
* | Merge topic 'hp-ux-itanium-shared-libs'Brad King2015-08-211-3/+5
|\ \ | | | | | | | | | | | | 625225bb HP-UX: Do not use ".sl" extension for shared libs on Itanium
| * | HP-UX: Do not use ".sl" extension for shared libs on ItaniumBrad King2015-08-181-3/+5
| | | | | | | | | | | | | | | | | | Instead use the standard ".so" extension. Suggested-by: Gerhard Grimm <gerhard.grimm@detec.com>
* | | Merge topic 'determine-compiler-CMP0054'Brad King2015-08-212-6/+8
|\ \ \ | |_|/ |/| | | | | | | | dc8822f0 CMakeDetermine{C,CXX}Compiler: Avoid if() auto-dereferene in quoted arguments
| * | CMakeDetermine{C,CXX}Compiler: Avoid if() auto-dereferene in quoted argumentsMatt McCormick2015-08-202-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exposed by a CMP0054 warning with code like: cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR) project(MyProj NONE) enable_language(C) enable_language(CXX) While at it, use STREQUAL for testing the compiler id against "GNU". Suggested-by: Rolf Eike Beer <eike@sf-mail.de>
| * | Merge branch 'compiler-version-Fortran' into releaseBrad King2015-08-051-0/+1
| |\ \
| * \ \ Merge branch 'osx-iframework' into releaseBrad King2015-07-222-0/+10
| |\ \ \
* | \ \ \ Merge topic 'finpkgconfig-if-deref'Brad King2015-08-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b9ec9392 FindPkgConfig: remove variable dereference
| * | | | | FindPkgConfig: remove variable dereferenceRolf Eike Beer2015-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If CMAKE_MINIMUM_REQUIRED_VERSION is not set because no cmake_minimum_required() call is present this line can lead to an error as that string is empty so too few arguments are passed to if(): See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeOutput.log". See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeError.log". CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:112 (elseif): given arguments: "VERSION_LESS" "3.1" Unknown arguments specified Call Stack (most recent call first): /usr/share/cmake/Modules/FindPkgConfig.cmake:501 (_pkgconfig_parse_options) /usr/share/cmake/Modules/FindOpenSSL.cmake:43 (pkg_check_modules)
* | | | | | Add support for ARTOS platform using GNU C with ac compiler driverKars de Jong2015-08-172-0/+26
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Add platform and compiler descriptions for ARTOS RTOS (locamation.com). Signed-off-by: Kars de Jong <kars.dejong@locamation.nl>
* | | | | Merge topic 'FindBoost-1.59'Brad King2015-08-171-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ff5bb2ef FindBoost: Add support for Boost 1.59
| * | | | | FindBoost: Add support for Boost 1.59Roger Leigh2015-08-141-2/+4
| | | | | |
* | | | | | Merge topic 'FindXercesC-updates'Brad King2015-08-171-4/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db292564 FindXercesC: Add support for 3D_1 variant of the library 021bf871 FindXercesC: Find debug and release libraries separately
| * | | | | | FindXercesC: Add support for 3D_1 variant of the libraryRoger Leigh2015-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version is generated by the Windows Visual Studio project files for unknown reasons, but is required to pick up the debug version of the library created by current versions of Xerces-C.
| * | | | | | FindXercesC: Find debug and release libraries separatelyRoger Leigh2015-08-141-4/+12
| |/ / / / /
* | | | | | Merge topic 'FindTIFF-updates'Brad King2015-08-171-1/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 724fa682 FindTIFF: Find debug and release libraries separately
| * | | | | | FindTIFF: Find debug and release libraries separatelyRoger Leigh2015-08-141-1/+13
| |/ / / / /
* | | | | | Merge topic 'compiler-id-ancient-gcc-version'Brad King2015-08-171-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6699834d GNU-DetermineCompiler: Add support for very old versions of GCC
| * | | | | | GNU-DetermineCompiler: Add support for very old versions of GCCKars de Jong2015-08-131-1/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Very old versions of gcc (2.3.1) do not define __GNUC_MINOR__. Signed-off-by: Kars de Jong <kars.dejong@locamation.nl>
* | | | | | FindOpenSSL: Provide imported targets OpenSSL::{SSL,Crypto}Konstantin Podsvirov2015-08-131-0/+73
| | | | | |
* | | | | | FindOpenSSL: Revise and format module documentationBrad King2015-08-131-15/+19
|/ / / / / | | | | | | | | | | | | | | | Improve reStructuredText formatting and add section headers.
* | | | | Merge topic 'FindPkgConfig-capital-messages'Brad King2015-08-131-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 50c9f521 FindPkgConfig: Capitalize first letter of all message()s
| * | | | | FindPkgConfig: Capitalize first letter of all message()sChristopher Meng2015-08-121-5/+5
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | This makes FindPkgConfig output more formal and more consistent with many other messages produced by CMake.
* | | | | Merge topic 'fix-hpux-link-search-shared-flags'Brad King2015-08-131-12/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dc64d825 HP-UX: Fix linker search type flags for C shared libs on HP-UX
| * | | | | HP-UX: Fix linker search type flags for C shared libs on HP-UXChuck Atkins2015-08-121-12/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.7~31^2 (HP: Drive shared library linking with compiler front end, 2011-12-12) the C compiler is used to link shared libraries instead of calling the linker directly, so linker options need to be wrapped as -Wl,-foo instead of -foo.
* | | | | Merge topic 'FindProtobuf-vs-x64'Brad King2015-08-121-6/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8dc6cbcb FindProtobuf: Search x64 directories in VS-built protobuf source (#14833)
| * | | | | FindProtobuf: Search x64 directories in VS-built protobuf source (#14833)A. Joël Lamotte2015-08-111-6/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Protobuf 2.6.x and lower do not use CMake (cmake is usable in Protobuf 3.x) but provide legacy Visual Studio projects files. Search their output directories in 64-bit builds.
* | | | | Merge topic 'ExternalProject-hg-clone-without-update'Brad King2015-08-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6a77a77a ExternalProject: Tell "hg clone" not to implicitly update
| * | | | | ExternalProject: Tell "hg clone" not to implicitly updateA. Joël Lamotte2015-08-111-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default Mercurial command "clone" will implicitly call "update" with the "default" branch after downloading the cloned repository. However ExternalProject_Add() always generates a second "update" command after cloning with a tag which is either specified or "tip" (equivalent to "default" by default). Therefore ExternalProject will first clone then update to default branch then update to another specified branch if provided. This leads to potentially very long clone operation (in particular when the repository default branch contain subrepos) which can lead to transaction abort triggered by the server. Simply use "hg clone -U" to avoid the implicit update during clone. Our following call to "hg update" will take care of updating anyway.
* | | | | CTest: Report to CDash the compiler version used to build the projectDaniel Pfeifer2015-08-111-0/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compiler version reported since commit v2.8.2~1018 (CTest-side support for compiler name and compiler version, 2009-10-12) only reported the version of the compiler used to build CMake, and only if it defined "_COMPILER_VERSION". Instead use the version of the compiler used to build the project CTest is testing.
* | | | Merge topic 'cpack-rpm-documentation-fixes'Brad King2015-08-061-0/+73
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94226751 Tests/RunCMake/CPack: Add dependencies tests 105011e0 Tests/RunCMake/CPack: Bump verify result cmake version d882d477 Tests/RunCMake/CPack/DEB: Add getPackageInfo helper function 145735b7 Tests/RunCMake/CPack: Enable CXX language in tests e26f53a8 CPack/RPM: missing PACKAGE_CONFLICTS documentation 64aacb24 CPack/RPM: undocumented variables
| * | | | CPack/RPM: missing PACKAGE_CONFLICTS documentationFrank-Christian Otto2015-08-041-0/+17
| | | | |
| * | | | CPack/RPM: undocumented variablesDomen Vrankar2015-08-041-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some CPack/RPM variables were undocumented even though they are implemented in code for quite a while now.
* | | | | Merge topic 'compiler-version-Fortran'Brad King2015-08-061-0/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | f0609182 Fortran: Store detected compiler version persistently (#15684)
| * | | | Fortran: Store detected compiler version persistently (#15684)Brad King2015-08-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Fortran compiler version detection infrastructure added by commit v3.3.0-rc1~436^2~9 (Fortran: Add infrastructure to detect compiler version, 2015-02-17) forgot to update CMakeFortranCompiler.cmake.in to save the compiler version persistently as we do already in "CMake{C,CXX}Compiler.cmake.in". Add the missing line now.
* | | | | UseJava: Teach install_jar new DESTINATION and COMPONENT optionsMarc Chevrier2015-08-041-6/+48
| | | | |
* | | | | UseJava: Teach add_jar to support file syntax for sourcesMarc Chevrier2015-08-041-9/+25
| | | | |
* | | | | FindJava: Add support for idlj and jarsigner toolsMarc Chevrier2015-08-041-23/+71
| |/ / / |/| | |
* | | | Merge topic 'if-test'Brad King2015-08-031-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 14e49ed1 if: Add "TEST <test>" condition 623dcc85 ExternalProject: Avoid if() auto-dereference of a "TEST" variable
| * | | | ExternalProject: Avoid if() auto-dereference of a "TEST" variableMatt McCormick2015-08-031-3/+3
| | | | | | | | | | | | | | | | | | | | Exposed by CMP0054 warnings.
* | | | | Merge topic 'GetPrerequisites-updates'Brad King2015-08-031-0/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d0a8b1a GetPrerequisites: Optionally filter "objdump" output for speed afb674ab GetPrerequisites: Add error checks for execute_process() calls
| * | | | | GetPrerequisites: Optionally filter "objdump" output for speedBill Somerville2015-07-311-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As dumpbin.exe is no longer reliable for gcc libraries on MinGW because it crashes on many common libraries like libgcc_s and libgfortran it is now necessary too resort to using objdump for DLL dependency walking. Using objdump has a secondary problem in that it generates a lot of output for large libraries and causes fixup_bundle() to take many minutes to process what took fractions of a second with "dumpbin.exe /dependents". Add a 'grep' pre-filter in the execute_process() command pipeline to reduce this output to a minimum for a several orders of magnitude speed up. If grep is not available just use the full output. As there does not seem to be a reliable way of detecting MinGW, callers of fixup_bundle() may have to set the variable gp_tool to "objdump" if dumpbin.exe is installed on the build machine to stop it using the broken MS dumpbin.exe for library dependency walking.
| * | | | | GetPrerequisites: Add error checks for execute_process() callsBill Somerville2015-07-311-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add return status checks to external command invocations so that they do not fail silently producing incomplete install packages.
* | | | | | Merge topic 'FindMPI-drop-GetPrerequisites'Brad King2015-08-031-5/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | 1c46b6ae FindMPI: Drop unnecessary and incorrect use of GetPrerequisites