summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cpack-dmg-multilanguage-sla'Brad King2015-11-091-0/+13
|\ | | | | | | | | f88533cc CPackDMG: Add support for multilingual SLAs
| * CPackDMG: Add support for multilingual SLAsSimon Levermann2015-11-061-0/+13
| | | | | | | | | | | | | | | | | | Multiple languages for SLAs and the SLA UI can be added via the CPack variables CPACK_DMG_SLA_DIR and CPACK_DMG_SLA_LANGUAGES. For each language defined in the languages variable, CPack will search for <language>.menu.txt and <language>.license.txt in CPACK_DMG_SLA_DIR. If the sla directory variable is not defined, the old behaviour using CPACK_RESOURCE_FILE_LICENSE is retained.
* | Merge topic 'cpack-deb-new-component-vars'Brad King2015-11-091-14/+34
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 04a2a923 Help: Add notes for topic 'cpack-deb-new-component-vars' 57672e72 CPackDeb: CPACK_DEBIAN_PACKAGE_NAME documentation improvement a45a4b2d CPackDeb: set package control field per component a60574f1 CPackDeb: set priority control field per component 24012e3c CPackDeb: additional CPACK_DEBIAN_PACKAGE_SECTION documentation 47182ab8 CPackDeb: set section control field per component
| * | CPackDeb: CPACK_DEBIAN_PACKAGE_NAME documentation improvementDomen Vrankar2015-11-091-2/+10
| | |
| * | CPackDeb: set package control field per componentMarkus Rickert2015-11-091-5/+7
| | |
| * | CPackDeb: set priority control field per componentDomen Vrankar2015-11-091-2/+6
| | |
| * | CPackDeb: additional CPACK_DEBIAN_PACKAGE_SECTION documentationDomen Vrankar2015-11-081-0/+5
| | |
| * | CPackDeb: set section control field per componentMarkus Rickert2015-11-081-7/+8
| | |
* | | Merge topic 'FindGTK2_GTK2_TARGETS'Brad King2015-11-091-0/+11
|\ \ \ | |/ / |/| | | | | | | | 5d79b956 FindGTK2: Use targets in GTK2_LIBRARIES if GTK2_USE_IMPORTED_TARGETS is ON
| * | FindGTK2: Use targets in GTK2_LIBRARIES if GTK2_USE_IMPORTED_TARGETS is ONDaniele E. Domenichelli2015-11-091-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Also add GTK2_TARGETS variable containing all imported targets. Previously, the GTK2_LIBRARIES variable was filled with the paths to the libraries, and only the GTK2_XXX_LIBRARY variables contained the imported targets.
* | | Merge topic 'cpack-deb-config-file-source-field'Brad King2015-11-061-15/+48
|\ \ \ | |_|/ |/| | | | | | | | | | | e5b70ed0 CPackDEB: added config file optional Source field f2d98e2d CPackDEB: minor documentation and debug logging fixes
| * | CPackDEB: added config file optional Source fieldRaffi Enficiaud2015-11-041-2/+35
| | |
| * | CPackDEB: minor documentation and debug logging fixesRaffi Enficiaud2015-11-041-13/+13
| |/
* | Merge topic 'find-cuda-dl'Brad King2015-11-041-8/+1
|\ \ | | | | | | | | | | | | b1efb023 FindCUDA: drop CUDA_dl_LIBRARY
| * | FindCUDA: drop CUDA_dl_LIBRARYRolf Eike Beer2015-11-031-8/+1
| |/ | | | | | | | | | | | | There is the global CMAKE_DL_LIBS setting which can be used instead. There are even platforms where this is either empty because those functions are part of the libc or is called entirely different, so this code wouldn't work reliable anyway.
* | Add support for the ARM Compiler (arm.com)Joakim Andersson2015-11-027-0/+68
|/ | | | | | | | Create an `ARMCC` compiler id corresponding to compilers identified and versioned by the `__ARMCC_VERSION` predefined macro. See documentation for the compilers at http://infocenter.arm.com/help/topic/com.arm.doc.set.swdev/index.html
* Merge topic 'intel-fortran-2016'Brad King2015-10-291-1/+3
|\ | | | | | | | | 77be366c Intel: Recognize MSVC version for Intel Fortran 2016 (#15809)
| * Intel: Recognize MSVC version for Intel Fortran 2016 (#15809)Brad King2015-10-261-1/+3
| |
* | Merge topic 'cpack-osx-sysroot'Brad King2015-10-291-1/+1
|\ \ | | | | | | | | | | | | 63e2af0f CPack: Fix CPACK_OSX_SYSROOT with symbolic CMAKE_OSX_SYSROOT (#15816)
| * | CPack: Fix CPACK_OSX_SYSROOT with symbolic CMAKE_OSX_SYSROOT (#15816)Brad King2015-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | We support setting CMAKE_OSX_SYSROOT to a symbolic value like "macosx". Modules/Platform/Darwin-Initialize.cmake takes care of finding the actual SDK path on disk. Use that result to set CPACK_OSX_SYSROOT instead.
* | | FindPkgConfig: return actual error when a package is not found (#15810)Benjamin Chrétien2015-10-281-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases, CMake returned the following error: -- Checking for module 'foo' -- Package 'foo' not found When the actual error returned by pkg-config was: Package 'bar', required by 'foo', not found Now, the actual error is forwarded to the user. -- Checking for module 'foo' -- Package 'bar', required by 'foo', not found For the standard case (i.e. the package was indeed not found), the CMake error was: -- Checking for module 'foo' -- Package 'foo' not found But it now prints: -- Checking for module 'foo' -- No package 'foo' found The associated test was also updated. ${last} refers to the last CLI argument.
* | | Merge topic 'fix-C-comment-syntax'Brad King2015-10-281-2/+2
|\ \ \ | |/ / |/| | | | | | | | e166203f CheckForPthreads.c: Do not use C++-style comments in C source
| * | CheckForPthreads.c: Do not use C++-style comments in C sourceMarc Chevrier2015-10-261-2/+2
| |/
* | Merge topic 'ninja-refactor-deptype-selection'Brad King2015-10-211-0/+2
|\ \ | | | | | | | | | | | | 123de191 Ninja: Refactor selection of 'deps = ' value for MS-compatible toolchains
| * | Ninja: Refactor selection of 'deps = ' value for MS-compatible toolchainsBrad King2015-10-201-0/+2
| | | | | | | | | | | | | | | | | | Set variables in the platform information modules to tell the Ninja generator what deps type to use instead of hard-coding conditions in the generator itself.
* | | Merge topic 'deprecate-CMakeForceCompiler'Brad King2015-10-211-3/+15
|\ \ \ | |/ / |/| | | | | | | | ed77504d CMakeForceCompiler: Deprecate this module and its macros
| * | CMakeForceCompiler: Deprecate this module and its macrosBrad King2015-10-191-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This module was added by commit v2.6.0~1489 (...supporting embedded compilers..., 2007-07-02) to avoid needing to build the compiler id detection source on toolchains that need special flags or linker files to produce executables. Since then CMake has learned other ways to identify such compilers (e.g. passing vendor-specific version flags and checking for vendor-specific banners in the output). Furthermore, CMake now detects a lot more than just the compiler id during language initialization in order to support things like <LANG>_STANDARD and COMPILE_FEATURES. Therefore CMakeForceCompiler is no longer a viable approach because it skips such detection. One remaining challenge to support toolchains that require special linker files is to build the test for a working compiler, compiler ABI detection binary, and other try_compile cases. This will have to be worked out as such cases are encountered.
* | | FindFLEX: Add a DEFINES_FILE option to specify flex-generated header (#15781)Chris Davies2015-10-191-6/+22
| | |
* | | FindFLEX: Fix typo in ADD_FLEX_BISON_DEPENDENCY errorsChris Davies2015-10-191-2/+2
| | |
* | | FindFLEX: Use CMAKE_PARSE_ARGUMENTS to parse argumentsChris Davies2015-10-191-22/+37
|/ /
* | Merge topic 'ExternalProject-fix-git-version'Brad King2015-10-161-1/+2
|\ \ | | | | | | | | | | | | | | | c9e0173e ExternalProject: Always use CMake builtin FindGit (#15791) 4cd52dc5 ExternalProject: Fix Git version report in error message (#15791)
| * | ExternalProject: Always use CMake builtin FindGit (#15791)Brad King2015-10-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Unset CMAKE_MODULE_PATH before calling find_package(Git) to ensure we do not get a project-provided FindGit module that may not provide the GIT_VERSION_STRING that we need. We do not need to restore the value explicitly because this occurs inside the _ep_add_download_command function call scope.
| * | ExternalProject: Fix Git version report in error message (#15791)Brad King2015-10-151-1/+1
| |/ | | | | | | | | | | Refactoring in commit v3.4.0-rc1~77^2~1 (ExternalProject: Use GIT_VERSION_STRING instead of custom method, 2015-09-17) forgot to update the variable name used in an error message.
* | Merge topic 'FindGit-Atlassian-SourceTree'Brad King2015-10-131-1/+5
|\ \ | | | | | | | | | | | | 57f701a7 FindGit: Search in 'Atlassian SourceTree' user directory (#15758)
| * | FindGit: Search in 'Atlassian SourceTree' user directory (#15758)Kevin Wojniak2015-10-121-1/+5
| | |
* | | Merge topic 'FindPostgreSQL-v9.5'Brad King2015-10-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 5225e004 FindPostgreSQL: Search for version 9.5
| * | | FindPostgreSQL: Search for version 9.5Tamar Kranenburg2015-10-121-1/+1
| | |/ | |/|
* | | Merge topic 'xcode-adjust-deployment-to-host-version'Brad King2015-10-131-0/+4
|\ \ \ | |_|/ |/| | | | | | | | 24aafbde Xcode: Adjust deployment target SDK version to host version
| * | Xcode: Adjust deployment target SDK version to host versionGregor Jasny2015-10-121-0/+4
| |/ | | | | | | | | | | | | | | | | | | If the automatically selected SDK is newer than the host OS version and no deployment version has been set then adjust the deployment version to the host OS version. Otherwise the user won't be able to launch the executables on the build host. This is for example a problem on a MacOSX 10.10 host with Xcode 7 which only provides a MacOSX10.11 SDK.
* | Merge topic 'cpack-wix-typos'Brad King2015-10-121-2/+2
|\ \ | | | | | | | | | | | | fb9ec243 CPackWIX: fix typos in documentation
| * | CPackWIX: fix typos in documentationKevin Wojniak2015-10-081-2/+2
| |/
* | Merge topic 'revert-compiler-features-solaris'Brad King2015-10-121-19/+13
|\ \ | | | | | | | | | | | | 340d0897 Revert topic 'compiler-features-solaris'
| * | Revert topic 'compiler-features-solaris'Brad King2015-10-081-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.4.0-rc1~10^2~2 (Features: Disable support for Oracle SolarisStudio on non-Linux, 2015-09-29) and two follow-up commits. The support of compile features and language standards on Orcale SolarisStudio needs more investigation so for CMake 3.4 we should just act as 3.3 did.
* | | Merge topic 'FindGTK2_sigc++_c++11'Brad King2015-10-121-0/+58
|\ \ \ | | | | | | | | | | | | | | | | 3d9e3d7b FindGTK2: Enable c++11 for sigc++ 2.5.1 or later
| * | | FindGTK2: Enable c++11 for sigc++ 2.5.1 or laterDaniele E. Domenichelli2015-10-121-0/+58
| | |/ | |/| | | | | | | | | | | | | | | | Starting with sigc++ 2.5.1, c++11 must be enabled in order to use sigc++. The GTK2::sigc++ imported target will automatically enable the required build flags in order to build with the version found on the system.
* | | Merge topic 'FindOpenSSL-mingw'Brad King2015-10-081-7/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | 1bf66fed FindOpenSSL: Search for unix-named libraries first on MinGW (#15765) 6b575dec FindOpenSSL: Tolerate tabs in header while parsing version (#15765)
| * | | FindOpenSSL: Search for unix-named libraries first on MinGW (#15765)Wayne Stambaugh2015-10-061-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generalize the change made by commit v2.8.10~228^2~4 (FindOpenSSL: find cross-compiled OpenSSL from MinGW, 2012-07-23) to be used on builds hosted on Windows too. When building for MinGW, consider library names that come with MinGW before looking for the main Windows distribution of OpenSSL.
| * | | FindOpenSSL: Tolerate tabs in header while parsing version (#15765)Wayne Stambaugh2015-10-061-1/+1
| | | | | | | | | | | | | | | | Tolerate tabs instead of spaces in the "# define" line.
* | | | Merge topic 'cpack-nsis-bitmap'Brad King2015-10-082-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3758af12 CPackNSIS: Add options to set the bitmap for NSIS installer left side
| * | | | CPackNSIS: Add options to set the bitmap for NSIS installer left sideColin Tracey2015-10-062-0/+10
| | |/ / | |/| | | | | | | | | | | | | | set MUI_WELCOMEFINISHPAGE_BITMAP set MUI_UNWELCOMEFINISHPAGE_BITMAP