summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindCUDA-aarch64'Brad King2015-11-241-0/+3
|\ | | | | | | | | ae1003cd FindCUDA: Add paths for crosscompiling to aarch64
| * FindCUDA: Add paths for crosscompiling to aarch64Alexander Szakaly2015-11-231-0/+3
| | | | | | | | | | Choose a CUDA_TOOLKIT_TARGET_DIR for the aarch64 architecture automatically.
* | Merge topic 'FindXercesC-imported-targets'Brad King2015-11-241-10/+57
|\ \ | | | | | | | | | | | | 5dcc833b FindXercesC: Add imported targets and unit test
| * | FindXercesC: Add imported targets and unit testRoger Leigh2015-11-231-10/+57
| | |
* | | Merge topic 'revert-compiler-links-statically'Brad King2015-11-247-23/+0
|\ \ \ | |_|/ |/| | | | | | | | 9682de56 Revert "Disable shared library support when compiler links statically" (#15855)
| * | Revert "Disable shared library support when compiler links statically" (#15855)Brad King2015-11-237-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | In commit v3.4.0-rc1~18^2 (Disable shared library support when compiler links statically, 2015-09-30) we tried to detect when the compiler is not capable of linking shared libraries (possibly due to flags in use). However, the approach is not robust against flags like `-nostdlib`. Revert it for now pending another solution to the original problem.
* | | Merge topic 'fix-forced-toolchain-dialect'Brad King2015-11-207-0/+29
|\ \ \ | |_|/ |/| | | | | | | | 441dba80 Project: Guess default standard dialect if compiler was forced (#15852)
| * | Project: Guess default standard dialect if compiler was forced (#15852)Brad King2015-11-197-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to commit v3.4.0-rc1~71^2 (Project: Determine default language dialect for the compiler, 2015-09-15) we always guessed the default language standard dialect based on the compiler version. This was not reliable so that commit switched to computing the default language standard dialect while detecting the compiler id. When a toolchain file uses CMakeForceCompiler to set the compiler id then the detection does not occur. Therefore commit v3.4.0-rc1~54^2 (Project: Don't require computed default dialect if compiler was forced, 2015-09-22) made the lack of detection an error only if the compiler was not forced. However, this means that projects using CMakeForceCompiler no longer even get the guess that we had before so <LANG>_COMPILER does not work. Due to the sophistication of CMake's compiler detection logic projects should be ported away from using CMakeForceCompiler. In the meantime, restore a guess of the default language standard dialect when the compiler is forced.
* | | Merge topic 'add-cray-linux-platform'Brad King2015-11-191-66/+88
|\ \ \ | | | | | | | | | | | | | | | | 743fcf1e Cray: Fix static / dynamic detection logic and parse more driver flags
| * | | Cray: Fix static / dynamic detection logic and parse more driver flagsChuck Atkins2015-11-181-66/+88
| | | |
* | | | Merge topic 'FindGTest-avoid-CMP0064'Brad King2015-11-191-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | b5e7b22d FindGTest: Refactor test type checks to avoid cases triggering CMP0064
| * | | | FindGTest: Refactor test type checks to avoid cases triggering CMP0064Brad King2015-11-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update our if() conditions to avoid CMP0064 warnings when `${test_type}` is equal to `TEST`. Reported-by: David T. Chen <dchen@mail.nih.gov>
* | | | | Merge topic 'fix-compute-default-dialect-lto'Brad King2015-11-182-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c3dc8935 Make C and C++ default dialect detection robust to advanced optimizations
| * | | | | Make C and C++ default dialect detection robust to advanced optimizationsBrad King2015-11-182-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.4.0-rc1~71^2 (Project: Determine default language dialect for the compiler, 2015-09-15) we added an "INFO:..." string to the compiler id detection binary. The value can be optimized out of the compiler id binary unless we force it to be included by making the program behavior depend on it at runtime. Add references to the value as we do for the other info strings already. Gentoo-Issue: https://bugs.gentoo.org/show_bug.cgi?id=565744
| * | | | Merge branch 'intel-fortran-2016' into releaseBrad King2015-10-291-1/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'ExternalProject-fix-git-version' into releaseBrad King2015-10-151-1/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'xcode-adjust-deployment-to-host-version' into releaseBrad King2015-10-121-0/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'FindPostgreSQL-v9.5' into releaseBrad King2015-10-121-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'cpack-wix-typos' into releaseBrad King2015-10-121-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'revert-compiler-features-solaris' into releaseBrad King2015-10-121-19/+13
| |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | SunOS: Remove obsolete Studio compiler library directoriesApril Chin2015-11-161-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES setting is no longer needed because CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES is now populated with the actual implicit link directories for the current toolchain. The old values we hard-coded in CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES are not relevant to modern toolchains, so simply drop them. Co-Author: Shawn Walker-Salas <shawn.walker@oracle.com>
* | | | | | | | | | | Merge topic 'add-cray-linux-platform'Brad King2015-11-162-0/+239
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31d52139 Cray: Added documentation for cross compiling on a Cray c54a621b Cray: New platform file for Cray Linux Environment and PrgEnv
| * | | | | | | | | | Cray: New platform file for Cray Linux Environment and PrgEnvChuck Atkins2015-11-142-0/+239
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'better_looking_mac_package'Brad King2015-11-131-5/+15
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bca9401 Improve appearance of CMake .dmg package on OS X c4b9ee18 CPack/DragNDrop: Update documentation to include new variables 167a4655 CPack/DragNDrop: Optionally run an AppleScript when making a package 9c1dfbfd CPack/DragNDrop: Place the background image file in a hidden folder 47302038 CPack/DragNDrop: Use source file extension for background image
| * | | | | | | | | | | CPack/DragNDrop: Update documentation to include new variablesRobert Maynard2015-11-131-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the new behavior of `CPACK_DMG_BACKGROUND_IMAGE` and the purpose of `CPACK_DMG_DS_STORE_SETUP_SCRIPT`.
* | | | | | | | | | | | Merge topic 'cray-fortran-version'Brad King2015-11-131-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09f754f0 Cray: Implement Fortran compiler version detection (#15845)
| * | | | | | | | | | | Cray: Implement Fortran compiler version detection (#15845)Brad King2015-11-121-0/+2
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already recognize the Cray Fortran compiler id. Extract the version number using the same predefined macros we already use for Cray C and C++ compilers.
* | | | | | | | | | | 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
| |/ / / / / / / /