summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 'fix-lexer-open-square'Brad King2014-08-194-35/+51
|\ \ | | | | | | | | | | | | 02b3cba9 cmListFileLexer: Fix lexing of single '[' character (#15092)
| * | cmListFileLexer: Fix lexing of single '[' character (#15092)Brad King2014-08-184-35/+51
| | | | | | | | | | | | | | | | | | | | | | | | The lexer changes in commit v3.0.0-rc1~495^2 (Add Lua-style long brackets and long comments to CMake language, 2013-08-06) accidentally left out matching '[' as a single character in an unquoted argument. Add a lexer rule to match it and extend the RunCMake.Syntax test to cover this case.
* | | Merge topic 'vs-refactor-includes'Brad King2014-08-195-25/+41
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5fcb42ab VS: Refactor include directory generation in .vcxproj files 8e026aa7 VS: Refactor include directory slash conversion 9633d112 cmIDEOptions: Add HasFlag method to test if a flag is set 84100102 cmIDEOptions: Add an AppendFlag overload to append multiple values
| * | | VS: Refactor include directory generation in .vcxproj filesBrad King2014-08-133-23/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the cmVisualStudioGeneratorOptions flag map to add the AdditionalIncludeDirectories element to the project file. Move appending of %(AdditionalIncludeDirectories) to the locations that populate the flag vectors instead of where they are written out.
| * | | VS: Refactor include directory slash conversionBrad King2014-08-131-3/+6
| | | | | | | | | | | | | | | | | | | | Convert each include directory to windows slashes once instead of repeating it each time they are written out to the project file.
| * | | cmIDEOptions: Add HasFlag method to test if a flag is setBrad King2014-08-132-0/+7
| | | |
| * | | cmIDEOptions: Add an AppendFlag overload to append multiple valuesBrad King2014-08-132-0/+10
| | | |
* | | | 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.
* | | | CMake Nightly Date StampKitware Robot2014-08-191-1/+1
| | | |
* | | | Merge topic 'vs-special-source-file-properties'Brad King2014-08-185-1/+98
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa21001b Help: Add notes for topic 'vs-special-source-file-properties' 6fe770e1 VS: Add a source file property to set the hlsl shader type 9b4dc2ad VS: Add a source file property to mark content for Windows App deployment f063a914 VS: Re-arrange WriteExtraSource to support tool configuration
| * | | | Help: Add notes for topic 'vs-special-source-file-properties'Brad King2014-08-121-0/+11
| | | | |
| * | | | VS: Add a source file property to set the hlsl shader typeBrad King2014-08-123-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a VS_SHADER_TYPE source file property. Inspired-by: Gilles Khouzam <gillesk@microsoft.com>
| * | | | VS: Add a source file property to mark content for Windows App deploymentBrad King2014-08-123-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a VS_DEPLOYMENT_CONTENT source file property, supporting generator expressions, to compute whether a source file should be marked as DeploymentContent or ExcludedFromBuild in Windows Phone and Windows Store projects. Inspired-by: Minmin Gong <minmin.gong@gmail.com>
| * | | | VS: Re-arrange WriteExtraSource to support tool configurationBrad King2014-08-121-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Add a code path to write the tool open and close elements separately so that we can add content in between to configure it.
* | | | | Merge topic 'fix_mumps_file_parser'Brad King2014-08-185-61/+85
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6d66e396 CTEST: Fix MUMPS file parser and update test
| * | | | | CTEST: Fix MUMPS file parser and update testJoseph Snyder2014-08-155-61/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current file parser for a MUMPS routine uses a period "." as the one of the signals that a line of MUMPS code is executable. This is not a correct assumption. Add the period to the list of characters that CTest will not consider the start of a line of code. Update the test routine to have an entry point with code to match the scenario mentioned above.
* | | | | | Merge topic 'ctest_update_status_only'Brad King2014-08-1812-21/+107
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Allow / to be in the build name, and be consistent with the build nameBill Hoffman2014-08-184-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change / was not allowed in the build name. This was tested with a CDash server and worked. In addition the safe build name was not used everywhere. This caused mismatched build names to be in the xml files going to CDash which caused different rows to be created for the same build.
| * | | | | | ctest_update: Add CTEST_UPDATE_VERSION_ONLY option to only note the versionBill Hoffman2014-08-188-11/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'cmake-gui-system-version'Brad King2014-08-181-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1412960e cmake-gui: Pass CMAKE_SYSTEM_VERSION from cross-compile configuration
| * | | | | | | cmake-gui: Pass CMAKE_SYSTEM_VERSION from cross-compile configurationGilles Khouzam2014-08-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although this value can be configured in the dialog, it was simply not passed to the project as CMAKE_SYSTEM_VERSION. Fix that.
* | | | | | | | Merge topic 'add-CheckFortranSourceCompiles'Brad King2014-08-185-0/+139
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7386d0d6 Add CheckFortranSourceCompiles module (#14656)
| * | | | | | | | Add CheckFortranSourceCompiles module (#14656)Brad King2014-08-185-0/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-189-58/+148
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6496b60 CPackIFW: Revise this generator
| * | | | | | | | | CPackIFW: Revise this generatorKonstantin Podsvirov2014-08-129-58/+148
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'makefile-assign-escape-octothorpe'Brad King2014-08-183-3/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fbf7a929 Makefile: Handle '#' in COMPILE_OPTIONS (#15070)
| * | | | | | | | | Makefile: Handle '#' in COMPILE_OPTIONS (#15070)Brad King2014-08-123-3/+16
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the Makefile generators to escape '#' characters on the right hand side of variable assignments in flags.make. This is needed for flags like '-Wno-error=#warnings'. Otherwise the make tool treats them as comments and leaves them out of the _FLAGS variable value. Add a case to the CompileOptions test covering '#' in a COMPILE_OPTIONS value, at least on compilers where it is known to be supported.
* | | | | | | | | 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 'create_test_sourcelist-msvc-warnings'Brad King2014-08-181-0/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63fc8dcd create_test_sourcelist: Suppress MSVC warnings in test driver (#15066)
| * | | | | | | | | create_test_sourcelist: Suppress MSVC warnings in test driver (#15066)Brad King2014-08-071-0/+4
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Suggested-by: Ken Moreland <kmorel@sandia.gov>
* | | | | | | | | CMake Nightly Date StampKitware Robot2014-08-181-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2014-08-171-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2014-08-161-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2014-08-151-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2014-08-141-1/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge branch 'release'Brad King2014-08-130-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'doc-CMP0022-compat-version-typo' into releaseBrad King2014-08-131-1/+1
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'doc-CMP0022-compat-version-typo'Brad King2014-08-131-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | | 91857e04 CMP0022: Fix version documented to support LINK_PUBLIC/LINK_PRIVATE
| * | | | | | | | CMP0022: Fix version documented to support LINK_PUBLIC/LINK_PRIVATEBrad King2014-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These have been available since 2.8.7, not 2.8.9 as the docs said.
* | | | | | | | | CMake Nightly Date StampKitware Robot2014-08-131-1/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge topic 'vs-windows-sdk-desktop-arm'Brad King2014-08-124-1/+16
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | VS: Fix generation of desktop applications for ARMGilles Khouzam2014-08-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add WindowsSDKDesktopARMSupport to the .vcxproj to avoid 'error MSB8022: Compiling Desktop applications for the ARM platform is not supported.' from VS.
| * | | | | | | 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-1222-5/+271
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Help: Add notes for topic 'vs-windows-phone-and-store'Brad King2014-08-051-0/+10
| | | | | | | |