summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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)
| * | | | ExternalProject: Clarify SVN_REVISION format in docs (#15081)Brad King2014-08-131-1/+1
| | |_|/ | |/| | | | | | | | | | Show the explicit '-r' that is required.
* | | | Merge topic 'ctest_update_status_only'Brad King2014-08-181-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 653529ce CTest: Allow / to be in the build name, and be consistent with the build name 39b5df2f ctest_update: Add CTEST_UPDATE_VERSION_ONLY option to only note the version
| * | | | ctest_update: Add CTEST_UPDATE_VERSION_ONLY option to only note the versionBill Hoffman2014-08-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows ctest_update to get the current version without actually changing the repository. This is useful when using Jenkins or an external project to update the source to a specific version, but you still want the current version to show up in CDash.
* | | | | Merge topic 'add-CheckFortranSourceCompiles'Brad King2014-08-181-0/+110
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | 7386d0d6 Add CheckFortranSourceCompiles module (#14656)
| * | | | Add CheckFortranSourceCompiles module (#14656)Brad King2014-08-181-0/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy the CheckCSourceCompiles module and port it to Fortran. Extend the FortranOnly test to try using the new module. Suggested-by: Nicolas Bock <nicolasbock@gmail.com>
* | | | | Merge topic 'cpack-ifw-generator'Brad King2014-08-181-16/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e6496b60 CPackIFW: Revise this generator
| * | | | | CPackIFW: Revise this generatorKonstantin Podsvirov2014-08-121-16/+32
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPack IFW generator updates: - Group now can have script; - Root package (for monolithic or one package installers) can be configured from group. CMake updates: - Native installation (no Unspecified component).
* | | | | Merge topic 'FindMPI-mpiexec-MPI_HOME'Brad King2014-08-181-1/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | 150c2125 FindMPI: Honor MPI_HOME for MPIEXEC (#14347)
| * | | | FindMPI: Honor MPI_HOME for MPIEXEC (#14347)Marcel Loose2014-08-111-1/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | We already use MPI_HOME and ENV{MPI_HOME} as hints for the location of the MPI compilers. Do the same for mpiexec, and then use the location of mpiexec as a hint to find the compilers.
* | | | Merge topic 'vs-windows-sdk-desktop-arm'Brad King2014-08-123-1/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2b20110f MSVC: Select default standard libraries for ARM platform 2dfcf0ed VS: Fix generation of desktop applications for ARM dbb5a7ee CMakeDetermineCompilerId: Fix detection for VS ARM platform
| * | | | MSVC: Select default standard libraries for ARM platformBrad King2014-08-121-1/+5
| | | | | | | | | | | | | | | | | | | | For Windows ARM targets, only kernel32.lib and user32.lib are standard.
| * | | | CMakeDetermineCompilerId: Fix detection for VS ARM platformBrad King2014-08-122-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add WindowsSDKDesktopARMSupport to the compiler id .vcxproj to avoid 'error MSB8022: Compiling Desktop applications for the ARM platform is not supported.' from VS. Inspired-by: Minmin Gong <minmin.gong@gmail.com> Inspired-by: Gilles Khouzam <gillesk@microsoft.com>
* | | | | Merge topic 'vs-windows-phone-and-store'Brad King2014-08-1210-4/+38
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d3d9a22 Help: Add notes for topic 'vs-windows-phone-and-store' 401a00d9 VS: Set WindowsPhone and WindowsStore min VS version required 709cebde VS: Generate WindowsPhone and WindowsStore application types 72395ab2 VS: Add .sln "Deploy" mark for WindowsPhone and WindowsStore binaries 2074f581 MSVC: Add system libs for WindowsPhone and WindowsStore c72f0887 MSVC: Add default WindowsPhone and WindowsStore compile flags 1c94558a MSVC: Disable incremental linking for WindowsPhone and WindowsStore 592098e2 Define 'WINDOWS_PHONE' and 'WINDOWS_STORE' variables aa42a78f Add WindowsPhone and WindowsStore platform information modules b94ddf6c CMakeDetermineCompilerId: Recognize WindowsPhone and WindowsStore d7938bff VS: Select WindowsPhone and WindowsStore default toolsets 3abd150c VS: Save WindowsPhone and WindowsStore system internally
| * | | | MSVC: Add system libs for WindowsPhone and WindowsStoreBrad King2014-07-311-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Use the libraries that are added by default by the VS 2013 IDE for Windows Phone and Windows Store projects.
| * | | | MSVC: Add default WindowsPhone and WindowsStore compile flagsPaul Annetts2014-07-311-0/+4
| | | | | | | | | | | | | | | | | | | | Also set the list of standard libraries to empty.
| * | | | MSVC: Disable incremental linking for WindowsPhone and WindowsStoreGilles Khouzam2014-07-311-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Do not add a "/INCREMENTAL" flag when using the toolchains for these systems.
| * | | | Define 'WINDOWS_PHONE' and 'WINDOWS_STORE' variablesGilles Khouzam2014-07-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Set one of these when CMAKE_SYSTEM_NAME is "WindowsPhone" or "WindowsStore", respectively.
| * | | | Add WindowsPhone and WindowsStore platform information modulesBrad King2014-07-316-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simply include the "Windows" platform equivalents. This will allow -DCMAKE_SYSTEM_NAME=WindowsPhone or -DCMAKE_SYSTEM_NAME=WindowsStore to select variants of the Windows platform while re-using most of the platform information from "Windows".
| * | | | CMakeDetermineCompilerId: Recognize WindowsPhone and WindowsStoreGilles Khouzam2014-07-312-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CMAKE_SYSTEM_NAME is set to target one of these, add ApplicationType and ApplicationTypeRevision elements to the .vcxproj file used to identify the compiler so that the WindowsPhone or WindowsStore toolchains can work. Co-Author: Brad King <brad.king@kitware.com>
* | | | | Add Fujitsu compiler detectionErik Lindahl2014-08-112-0/+3
| |/ / / |/| | | | | | | | | | | | | | | | | | | The Fujitsu C/C++ compilers are the default ones for K computer. Detect both native and cross compilers by looking for the __FUJITSU preprocessor definition.
* | | | Merge topic 'BundleUtilities-os9-newlines'Brad King2014-08-111-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 810f5cce BundleUtilities: Allow Info.plist files which use CR line endings
| * | | | BundleUtilities: Allow Info.plist files which use CR line endingsTim Blechmann2014-08-071-0/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | Convert \r to our internal end-of-line character just as we do \n. Signed-off-by: Tim Blechmann <tim@klingt.org>
* | | | Merge topic 'cpack-ifw-generator'Brad King2014-08-111-3/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ebe8d51b CPackIFW: Refactor and revise this generator 82382479 Doxygen: Add STRIP_FROM_PATH variable to doxyfile.in 3040ab8f Doxygen: Add CPack/IFW subdir to doxyfile.in INPUT section
| * | | | CPackIFW: Refactor and revise this generatorKonstantin Podsvirov2014-08-111-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split the monolithic cmCPackIFWGenerator source into three parts: cmCPackIFWGenerator, cmCPackIFWInstaller, and cmCPackIFWPackage to isolate the implementations somewhat. Add a COMMON option to the cpack_ifw_configure_component command to make the data component common to its parent group. Change the default packaging method to ONE_PACKAGE_PER_COMPONENT. This is not incompatible because the CPack IFW generator has not yet been in a release.
* | | | | Merge topic 'CMakePackageConfigHelpers-INSTALL_PREFIX'Brad King2014-08-111-136/+157
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 704830ae Help: Add notes for topic 'CMakePackageConfigHelpers-INSTALL_PREFIX' e3007c92 CMakePackageConfigHelpers: Add unit tests for INSTALL_PREFIX option d057bf85 CMakePackageConfigHelpers: Add INSTALL_PREFIX option f3dd116c CMakePackageConfigHelpers: restructure documentation and document commands 64eca30d CMakePackageConfigHelpers: Remove unused variable
| * | | | CMakePackageConfigHelpers: Add INSTALL_PREFIX optionDaniele E. Domenichelli2014-08-111-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option instructs configure_package_config_file to consider paths that are not absolute as relative to the INSTALL_PREFIX directory instead of relative to the CMAKE_INSTALL_PREFIX directory. If this argument is not passed, the default behaviour is to use the CMAKE_INSTALL_PREFIX variable. The new signature is therefore: configure_package_config_file(<input> <output> INSTALL_DESTINATION <path> [PATH_VARS <var1> <var2> ... <varN>] [NO_SET_AND_CHECK_MACRO] [NO_CHECK_REQUIRED_COMPONENTS_MACRO] [INSTALL_PREFIX <path>])
| * | | | CMakePackageConfigHelpers: restructure documentation and document commandsDaniele E. Domenichelli2014-08-111-120/+125
| | | | |
| * | | | CMakePackageConfigHelpers: Remove unused variableDaniele E. Domenichelli2014-08-041-2/+0
| |/ / /
* | | | Merge topic 'ExternalData-drop-security-disclaimer'Brad King2014-08-061-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f2ccc14b ExternalData: Drop 'not security software' disclaimer (#15060)