summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ExternalProject-retry'Brad King2014-09-221-6/+0
|\ | | | | | | | | 30a94eec ExternalProject: Fix download retry logic
| * ExternalProject: Fix download retry logicRuslan Baratov2014-09-151-6/+0
| | | | | | | | | | | | | | Do not check file's hash in download script. If hash will not match command ``file(DOWNLOAD ...)`` will fail with FATAL_ERROR, ``cmake -P`` will exit with unsuccessful code, and the build will stop. Leave hash checking to the existing implementation in the verify step.
* | Merge topic 'vs-generator-platform'Brad King2014-09-151-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | be6a555d Tests: Test setting a generator platform in a toolchain file d506fee8 Tests: Use -A option to pass generator platform selection 11c9ddd6 ExternalProject: Use -A option to pass generator platform 29bd843e CTest: Use -A option to pass generator platform selection eb7d8156 cmake: Add -A option to specify a generator platform
| * | ExternalProject: Use -A option to pass generator platformBrad King2014-09-151-2/+2
| | | | | | | | | | | | This is less verbose than defining CMAKE_GENERATOR_PLATFORM.
* | | Merge topic 'if-sanity'Brad King2014-09-156-6/+6
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 858d5a0b Fix if() checks of CMAKE_SYSTEM_NAME on Cygwin e177e7af FPHSA: Avoid if() dereferencing of quoted variable 425acc52 cmcurl: Use if(DEFINED) to simplify conditions cede5cbd libarchive: Avoid depending on if() to dereference a quoted variable 2d97178b FindGTK2: Avoid depending on if() to dereference a quoted variable 0b12815d Modules/Test*.cmake: Use if(DEFINED) to simplify conditions 188a1f23 If: Introduce policy CMP0054 - don't dereference quoted variables in if() b900c1cc If: Extract cmConditionEvaluator from if() implementation
| * | FPHSA: Avoid if() dereferencing of quoted variableBrad King2014-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | Legacy invocations may pass a variable name where "DEFAULT_MSG" belongs. When comparing FPHSA_FAIL_MESSAGE to "DEFAULT_MSG", use a leading "x" on both sides to avoid mistaking the value of the message for a variable name.
| * | FindGTK2: Avoid depending on if() to dereference a quoted variableBrad King2014-09-111-1/+1
| | | | | | | | | | | | | | | Explicitly dereference GTK2_${_var}CONFIG_INCLUDE_DIR and GTK2_${_var}_INCLUDE_DIR when comparing their values.
| * | Modules/Test*.cmake: Use if(DEFINED) to simplify conditionsBrad King2014-09-114-4/+4
| | | | | | | | | | | | | | | Replace old hacks of the form 'if("${VAR}" MATCHES "^${VAR}$")' with the much simpler 'if(NOT DEFINED ${VAR})'.
* | | Merge topic 'doc-check-results-cached'Brad King2014-09-1116-1/+18
|\ \ \ | | | | | | | | | | | | | | | | 908c7439 Help: Document that the CHECK_* macros create cache variables
| * | | Help: Document that the CHECK_* macros create cache variablesSebastian Leske2014-09-1116-1/+18
| | | | | | | | | | | | | | | | Otherwise callers may expect to be able to re-use result variables.
* | | | Merge topic 'fix-gnu-hurd-host-detection'Brad King2014-09-111-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | 89d7a5a4 Fix CMAKE_HOST_SYSTEM_PROCESSOR detection on GNU/Hurd (#15147)
| * | | Fix CMAKE_HOST_SYSTEM_PROCESSOR detection on GNU/Hurd (#15147)Felix Geyer2014-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | On Debian GNU/Hurd 'uname -p' prints "unknown", so use 'uname -m' instead.
* | | | Merge topic 'vs-generator-platform'Brad King2014-09-101-0/+11
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09c8ad99 enable_language: Initialize system-specific generator info only once 09ab207c Tests: Add generator platform support 6944997b ExternalProject: Propagate the generator platform 8d332091 CTest: Add options to set generator platform b97736a2 VS: Implement CMAKE_GENERATOR_PLATFORM for VS >= 8 0f1f1271 CMake: Add CMAKE_GENERATOR_PLATFORM option 4f7d0c42 Help: Document CMAKE_VS_PLATFORM_NAME variable 68d4280a VS: Refactor internal default platform name selection ad2a4776 cmGlobalVisualStudio10Generator: Re-order some methods 03b7b6cd cmGlobalGenerator: Call SetGeneratorToolset even for empty toolset
| * | | ExternalProject: Propagate the generator platformBrad King2014-09-051-0/+11
| | |/ | |/| | | | | | | | | | | | | | | | | | | When the CMAKE_GENERATOR option is given to ExternalProject_Add, look also for option CMAKE_GENERATOR_PLATFORM to pass on to cmake as a cache definition. When no CMAKE_GENERATOR option is given explicitly then use the current project's CMAKE_GENERATOR_PLATFORM (since we already use its CMAKE_GENERATOR).
* | | Merge topic 'FindIce-updates'Brad King2014-09-101-18/+15
|\ \ \ | |_|/ |/| | | | | | | | | | | 2131aedd FindIce: Respect Ice_FIND_QUIETLY when printing messages d5047ca1 FindIce: Remove unneeded search path modification
| * | FindIce: Respect Ice_FIND_QUIETLY when printing messagesRoger Leigh2014-09-091-12/+16
| | |
| * | FindIce: Remove unneeded search path modificationRoger Leigh2014-09-091-7/+0
| | | | | | | | | | | | Drop code adding redundant "/opt/Ice-${ice_version}" paths.
* | | Merge topic 'use-consistent-regex-for-info-strings'Brad King2014-09-093-3/+3
|\ \ \ | | | | | | | | | | | | | | | | 3e84e78c Use a more reliable regex for extracting binary INFO strings
| * | | Use a more reliable regex for extracting binary INFO stringsChuck Atkins2014-09-033-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A few different regular expressions were being used in various places to extract info strings from binaries. This uses a consistent regex amongst all of them now. This also fixes the broken ABI detection for Cray compilers.
* | | | Merge topic 'ExternalProject-download-loop'Brad King2014-09-091-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 9f49ac3d ExternalProject: Avoid infinite loop on file download hash mismatch
| * | | | ExternalProject: Avoid infinite loop on file download hash mismatchAlan W. Irwin2014-09-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the loop was added by commit v3.0.0-rc1~103^2~3 (ExternalProject: Reattempt download when verification fails, 2015-01-15), we forgot to actually increment the loop counter. Add the increment line.
* | | | | Merge topic 'fix-clang-cross-compile-find-binutils'Brad King2014-09-082-2/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | 72d66818 Fix finding binutils when cross-compiling with Clang
| * | | | Fix finding binutils when cross-compiling with ClangBrad King2014-09-052-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.0.0-rc1~342^2~2 (Add compiler target compile options, 2013-05-19) we use CMAKE_<LANG>_COMPILER_TARGET as the binutils prefix when cross-compiling with Clang. Fix the implementation to use the compiler target as the prefix only when it is set. Otherwise toolchain files not using CMAKE_<LANG>_COMPILER_TARGET cause the logic to use a prefix of just "-" and of course cannot find "-ar" or "-ld".
* | | | | Merge topic 'fix-gtk2-missing-optional-includes'Brad King2014-09-041-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cb8f0f7c FindGTK2: Fix missing optional include dirs.
| * | | | | FindGTK2: Fix missing optional include dirs.Chuck Atkins2014-09-041-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindGTK2 was adding optional include directories to the interface include dirs regardless of whether or not they existed. This ensures that the directories only get added if they are actually found. This is particularly a problem on Solaris where the gtk2 libs and headers might exist but the FreeType2 headers might not.
* | | | | | Merge topic 'InstallRequiredSystemLibraries-vs-openmp'Brad King2014-09-041-0/+36
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | d538c55e Help: Add notes for topic 'InstallRequiredSystemLibraries-vs-openmp' bdb5007b InstallRequiredSystemLibraries: Install OpenMP runtime libs (#15117)
| * | | | | InstallRequiredSystemLibraries: Install OpenMP runtime libs (#15117)Gregory Sharp2014-09-021-0/+36
| |/ / / / | | | | | | | | | | | | | | | Add option CMAKE_INSTALL_OPENMP_LIBRARIES to control the behavior.
* | | | | Merge topic 'fix-findpostgres-for-multilib'Brad King2014-09-021-6/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 741f29cc FindPostgreSQL: Fix for pg_config in multilib configurations.
| * | | | | FindPostgreSQL: Fix for pg_config in multilib configurations.Chuck Atkins2014-09-021-6/+16
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some platforms, Fedora 20 and RHEL 7 in particular, will have multiple pg_config_${arch}.h files all included by the top level pg_config.h. This checks all of the available pg_config*.h headers for version information.
* | | | | Merge topic 'asm-user-override-files'Brad King2014-09-021-0/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 487f147f Load CMAKE_USER_MAKE_RULES_OVERRIDE[_ASM] for assembler (#15108)
| * | | | | Load CMAKE_USER_MAKE_RULES_OVERRIDE[_ASM] for assembler (#15108)Mikhail Nikonov2014-08-271-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | This is already done for C, CXX, and Fortran.
* | | | | | Merge topic 'vs-windows-apps'Brad King2014-09-022-5/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39fefde2 VS: Add test case for Windows Phone and Windows Store 89da8465 MSVC: Define 'WIN32' for Windows Store and Windows Phone ed7f085f Help: Add notes for topic 'vs-windows-apps' dd11ae8f VS: Do not compile C sources as WinRT (#15100) b8e40538 VS: Mark Windows Phone and Store targets as App Containers 0432f062 VS: Always ignore ole32 on Windows Phone 8.0 e6ff2f8b VS: Generate Windows Metadata for WinRT components ee48f4c7 VS: Generate Windows Phone and Windows Store projects as Unicode cb1aceed VS: Add VS_WINRT_COMPONENT property to enable CompileAsWinRT 401269e4 VS: Handle .pfx files explicitly in generator 23782171 VS: Handle AppxManifest sources explicitly in generator bc373c6d VS: Set Window Phone/Store app type in CMake-generated targets d89b2889 VS: Mark CMake-generated targets as Utility in .vcxproj files 03ad8f28 CMakeDetermineCompilerABI: Link with standard libraries on MSVC
| * | | | | MSVC: Define 'WIN32' for Windows Store and Windows PhoneGilles Khouzam2014-09-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was accidentally left out of commit c72f0887 (MSVC: Add default WindowsPhone and WindowsStore compile flags, 2014-07-28).
| * | | | | CMakeDetermineCompilerABI: Link with standard libraries on MSVCBrad King2014-08-211-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v2.8.0~395 (Implicit link info for C, CXX, and Fortran, 2009-07-23) we added a '-DCMAKE_${lang}_STANDARD_LIBRARIES=' flag to the try_compile used to build the ABI detection project. It is needed when detecting the implicit libraries added by the GNU compiler on Windows (MinGW tools) to avoid contaminating the list with standard Windows libraries. However, with MSVC we do not detect such implicit link libraries anyway, and for some target platforms (e.g. Windows Phone) we may need the standard libraries to link the ABI detection executable. Drop the flag when detecting the ABI using MSVC.
* | | | | | Merge topic 'wxWidgets-cflags'Brad King2014-08-271-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6fa6e60 UsewxWidgets: CFLAGS are expected to be a string here, not a list.
| * | | | | | UsewxWidgets: CFLAGS are expected to be a string here, not a list.Richard M. Shaw2014-08-221-2/+5
| | |/ / / / | |/| | | |
* | | | | | FindwxWidgets: Improve path detection logic when cross-compiling.Richard M. Shaw2014-08-221-4/+3
|/ / / / /
* | | | | Merge topic 'vs-masm'Brad King2014-08-222-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cbd1d42b Help: Add notes for topic 'vs-masm' 0f8522a6 VS: Add MASM support to VS 8 and 9 (#8170, #14984) a43f4400 VS: Move internal MasmEnabled member up to VS 7 generator df3b007d VS: Add test for MASM support e8727449 VS: Populate MASM tool build settings in .vcxproj files 0271a5f9 VS: Manually fix MASM flag table entries 1d662e48 VS: Generate MASM flag tables from MSBuild tool files 4f6940df VS: Fix ASM_MASM support in VS >= 10 d7866c52 ASM_MASM: Fix selection of ml64 0374abdb ASM_MASM: Add preprocessor definitions to compile lines 5b0a46e1 ASM_MASM: Do not require compiler to be a full path 802dbe52 cmLocalVisualStudio7Generator: Rename local 'lang' var
| * | | | | ASM_MASM: Fix selection of ml64Brad King2014-08-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recognize 64-bit platforms based on the C or CXX architecture or the platform specified with a VS generator name.
| * | | | | ASM_MASM: Add preprocessor definitions to compile linesBrad King2014-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MASM tools (ml, ml64) support -D preprocessor definition flags. Update our compilation rule variable to pass them.
* | | | | | Merge topic 'FindXerces'Brad King2014-08-221-0/+85
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | 20407006 FindXerces: New module to find Apache Xerces-C++
| * | | | | FindXerces: New module to find Apache Xerces-C++Roger Leigh2014-08-211-0/+85
| | | | | |
* | | | | | FindIce: New module to find ZeroC IceRoger Leigh2014-08-211-0/+396
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - autodetects Ice on all major platforms - allows building with all supported Visual Studio versions on Windows - autodetects the slice path on most platforms - separately detects the Ice programs, headers, slice files and libraries so that any Ice configuration or installation errors can be accurately reported, making diagnosis of Ice problems simpler
* | | | | Merge topic 'check-flag-for-intel'Brad King2014-08-201-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 914db028 Check*CompilerFlag: Add another pattern for Intel (#15096)
| * | | | | Check*CompilerFlag: Add another pattern for Intel (#15096)Roland Schulz2014-08-191-0/+1
| | |/ / / | |/| | | | | | | | | | | | | Match "argument is of wrong type" warnings.
* | | | | Merge topic 'FindOpenMP-add-Fortran-support'Brad King2014-08-191-0/+47
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d0678408 FindOpenMP: Add support for Fortran (#14656)
| * | | | | FindOpenMP: Add support for Fortran (#14656)Nicolas Bock2014-08-181-0/+47
| | | | | |
* | | | | | Merge topic 'fix-check-module-DEFINED-tests'Brad King2014-08-193-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ffec8f6 Check*: Add compatibility hack for old VXL code
| * | | | | | Check*: Add compatibility hack for old VXL codeBrad King2014-08-183-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cleanup in commit 4f2fcce4 (Check*: Allow result variables to contain regex special characters, 2014-07-31) broke old VXL code that abuses the old "if(MATCHES)" implementation by using SET( ${VARIABLE} ${VARIABLE} ) to reset a check result variable. Add a compatibility hack to the CheckFunctionExists, CheckIncludeFileCXX, and CheckSymbolExists modules to re-run their checks when the result variable is set to its own name. Use STREQUAL instead of MATCHES so that special characters still work.
* | | | | | | Merge topic 'ExternalProject-doc-SVN_REVISION-format'Brad King2014-08-191-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | b26faaf1 ExternalProject: Clarify SVN_REVISION format in docs (#15081)