summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* try_compile: Add COPY_FILE_ERROR option to capture failureBrad King2013-07-1510-5/+78
| | | | | | | | | | | When the COPY_FILE operation fails optionally capture the error message with a COPY_FILE_ERROR option instead of reporting the error immediately. This gives callers a chance to do something else or report the error. Teach the RunCMake.try_compile test to cover bad argument combinations involving COPY_FILE_ERROR. Teach the TryCompile test to cover the case of a COPY_FILE error message captured by COPY_FILE_ERROR.
* CMake Nightly Date StampKitware Robot2013-07-081-1/+1
|
* CMake Nightly Date StampKitware Robot2013-07-071-1/+1
|
* CMake Nightly Date StampKitware Robot2013-07-061-1/+1
|
* CMake Nightly Date StampKitware Robot2013-07-051-1/+1
|
* CMake Nightly Date StampKitware Robot2013-07-041-1/+1
|
* Merge branch 'release'Brad King2013-07-031-0/+18
|\
| * CMake 2.8.11.2v2.8.11.2Brad King2013-07-022-1/+19
| |
| * Merge branch 'vs-generator-brief-doc-update' into releaseBrad King2013-07-023-3/+3
| |\
| * \ Merge branch 'vs12-generator' into releaseBrad King2013-07-0220-13/+978
| |\ \
| * \ \ Merge branch 'curl-bug-1192' into releaseBrad King2013-07-027-58/+9
| |\ \ \
| * \ \ \ Merge branch 'sha2-alignment' into releaseBrad King2013-07-021-3/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'FixAsmSupport' into releaseBrad King2013-07-023-4/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'SelectLibraryConfigurations-cached-library' into releaseBrad King2013-07-021-1/+1
| |\ \ \ \ \ \
* | | | | | | | CMake Nightly Date StampKitware Robot2013-07-031-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'Fortran-explicit-types'Brad King2013-07-021-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b5bc2c Fortran: Use explicit type in Fortran 90 check
| * | | | | | | | Fortran: Use explicit type in Fortran 90 checkBrad King2013-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CMakeTestFortranCompiler we build a test program using a Fortran 90 construct to check whether the compiler supports the language. Some compilers have options to require explicit variable types. Fix the test program to use an explicit variable type so it passes under such a configuration. Suggested-by: Neil Carlson <neil.n.carlson@gmail.com>
* | | | | | | | | Merge topic 'update-kwsys'Brad King2013-07-021-57/+57
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c314da0 Merge branch 'upstream-kwsys' into update-kwsys 2e3c935 KWSys 2013-07-01 (f6c4c247)
| * \ \ \ \ \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-07-011-57/+57
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | KWSys 2013-07-01 (f6c4c247)KWSys Robot2013-07-011-57/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ f6c4c247 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 3d1d4e7c..f6c4c247 Sean McBride (1): f6c4c247 RegularExpression: Remove 'register' storage specifier Change-Id: I755712879ab86fa163f5fce684fff2f0ecd8ab99
* | | | | | | | | | Merge topic 'FindGTK2vd2'Brad King2013-07-021-0/+17
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60e4555 FindGTK2: Add GTK2_DEFINITIONS variable
| * | | | | | | | | | FindGTK2: Add GTK2_DEFINITIONS variableDaniele E. Domenichelli2013-06-291-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://wiki.gnome.org/gtkmm/MSWindows on MSVC the /vd2 flag should be passed to the compiler in order to use gtkmm
* | | | | | | | | | | Merge topic 'FindGTK2vs11'Brad King2013-07-021-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb16301 FindGTK2: Do not fail on MSVC11 if vc100 libraries are available
| * | | | | | | | | | | FindGTK2: Do not fail on MSVC11 if vc100 libraries are availableDaniele E. Domenichelli2013-06-291-0/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge topic 'make-depends-collapse-paths'Brad King2013-07-023-14/+44
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 551d334 cmDependsC: Collapse relative include paths
| * | | | | | | | | | | cmDependsC: Collapse relative include pathsPavel Shramov2013-06-263-14/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While calculating dependencies collapse sequences such as ../../../a/b/c/../../d/e/../../e/f to avoid total path lengths over the Windows path length limit as much as possible.
* | | | | | | | | | | | Merge topic 'SelectLibraryConfigurations-cached-library'Brad King2013-07-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c4bcc56 SelectLibraryConfigurations: Fix for cached <base>_LIBRARY
| * | | | | | | | | | | SelectLibraryConfigurations: Fix for cached <base>_LIBRARYBjoern Thiel2013-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The line set( ${basename}_LIBRARY ) removes the normal variable, but if the corresponding cached variable is present then line list( APPEND ${basename}_LIBRARY optimized "${_libname}" ) uses that and fails. Replace the original line with set( ${basename}_LIBRARY "" ) to set the normal variable to empty instead of unsetting it.
* | | | | | | | | | | | Merge topic 'vs-generator-brief-doc-update'Brad King2013-07-023-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 52f1464 VS: Clarify Visual Studio product year for each version
| * | | | | | | | | | | VS: Clarify Visual Studio product year for each versionRobert Maynard2013-07-023-3/+3
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add to the brief documentation of the Visual Studio 10, 11, and 12 generators the corresponding VS product year. Clarify that VS11 is for Visual Studio 2012, and VS12 is for Visual Studio 2013.
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-07-021-1/+1
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge topic 'vs12-generator'Brad King2013-07-0121-15/+984
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a76d83 VS12: Find proper MSBuild for VSProjectInSubdir test 4e5cb39 Merge branch 'master' into vs12-generator 78fdbbc FindBoost: Add -vc120 mangling for VS 12 e99d7b1 VS12: Generate flag tables from MSBuild v120 tool files 77ac9b8 VS12: Add Visual Studio 12 generator (#14251)
| * | | | | | | | | | VS12: Find proper MSBuild for VSProjectInSubdir testBrad King2013-06-281-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the CTest make program is not msbuild we find the msbuild corresponding to the current test generator. In the case of VS 12 search for the msbuild it provides.
| * | | | | | | | | | Merge branch 'master' into vs12-generatorBrad King2013-06-28524-2396/+9975
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflicts in Tests/Preprocess/CMakeLists.txt by keeping the side from 'master'.
| * | | | | | | | | | FindBoost: Add -vc120 mangling for VS 12Brad King2013-06-281-0/+2
| | | | | | | | | | |
| * | | | | | | | | | VS12: Generate flag tables from MSBuild v120 tool filesBrad King2013-06-285-6/+763
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run cmparseMSBuildXML.py on cl.xml, lib.xml, and link.xml to generate our flag tables: python cmparseMSBuildXML.py -x ".../MSBuild/Microsoft.Cpp/v4.0/v120/1033/cl.xml" > cmVS12CLFlagTable.h python cmparseMSBuildXML.py -x ".../MSBuild/Microsoft.Cpp/v4.0/v120/1033/lib.xml" > cmVS12LibFlagTable.h python cmparseMSBuildXML.py -x ".../MSBuild/Microsoft.Cpp/v4.0/v120/1033/link.xml" > cmVS12LinkFlagTable.h Fix up the declaration names at the top of each file. Finally, teach cmVisualStudio10TargetGenerator to select the version of the table matching the version of VS.
| * | | | | | | | | | VS12: Add Visual Studio 12 generator (#14251)Brad King2013-06-2814-7/+213
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy cmGlobalVisualStudio11Generator to cmGlobalVisualStudio12Generator and update version numbers accordingly. Add the VS12 enumeration value. Add module CMakeVS12FindMake to find MSBuild. Look for MSBuild in its now-dedicated Windows Registry entry. Teach the platform module Windows-MSVC to set MSVC12 and document the variable. Teach module InstallRequiredSystemLibraries to look for the VS 12 runtime libraries. Teach tests CheckCompilerRelatedVariables, Preprocess, VSExternalInclude, and RunCMake.GeneratorToolset to treat VS 12 as they do VS 10 and 11. Inspired-by: Minmin Gong <minmin.gong@gmail.com>
* | | | | | | | | | Merge topic 'clang-register-warnings'Brad King2013-07-0120-101/+110
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e1381b1 Document removal of 'register' from flex/bison output 1399825 Remove some uses of obsolete 'register' storage specifier
| * | | | | | | | | | Document removal of 'register' from flex/bison outputBrad King2013-06-289-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In each .l and .y input file that has instructions for manual transformation of the output to include a step to remove the 'register' storage specifier.
| * | | | | | | | | | Remove some uses of obsolete 'register' storage specifierSean McBride2013-06-2811-101/+101
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the keyword from all Source/* files outside of KWSys.
* | | | | | | | | | Merge topic 'AddAutomocTargetFolder'Brad King2013-07-013-3/+23
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ba0e06f automoc: add a global AUTOMOC_TARGETS_FOLDER property
| * | | | | | | | | | automoc: add a global AUTOMOC_TARGETS_FOLDER propertyAlex Neundorf2013-06-283-3/+23
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been requested, along with a patch, by Shaun Williams in http://public.kitware.com/Bug/view.php?id=13788 . It adds a global property AUTOMOC_TARGETS_FOLDER, which can be used to group the automoc targets together in a folder e.g. in Visual Studio. Alex
* | | | | | | | | | Merge topic 'DontStripImportLibs'Brad King2013-07-011-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae8e654 install: do not strip dll import libraries (#14123)
| * | | | | | | | | | install: do not strip dll import libraries (#14123)Alex Neundorf2013-07-011-3/+3
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DLL import libraries exist specifically to have symbols.
* | | | | | | | | | Merge topic 'CMakeDetermineVSServicePack-vs11'Brad King2013-07-011-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f449c68 CMakeDetermineVSServicePack: Add VS 11 update 3
| * | | | | | | | | | CMakeDetermineVSServicePack: Add VS 11 update 3Brad King2013-06-281-0/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'vs-windows-forms'Brad King2013-07-013-8/+47
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c9712c VS: Add Resx configuration to the vcxproj file
| * | | | | | | | | | | VS: Add Resx configuration to the vcxproj fileJonas Andersen2013-06-283-8/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In my project group we are using CMake to generate c++/cli winform projects and I noticed the work done in commit 79ec7868 (VS: Add Windows Forms Support, 2013-04-29) was in the right direction for solving some of the problems we were facing. The changes as submitted was breaking some functionality in our projects, so I made some changes that fixes our problems and I believe that it will also work for others. * Resx files did not link correctly with the winform h-file so I added the Resx configuration to the vcxproj file. * I removed the functionality for setting <CLRSupport> true for the project based on if an resx-file is pressent. This is preventing us from using native cpp code. Also this do not address that some projects will need to set other options like clr:pure, clr:safe. This could be implemented as a cmake option, so it is possible to specify exactly what is needed. Existing VSWindowsFormsResx Test project is updated so it will be working with my changes.
* | | | | | | | | | | | Merge topic 'split-GeneratorExpression-test'Brad King2013-07-013-9/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cacb938 Split the GeneratorExpression test into a third part.
| * | | | | | | | | | | | Split the GeneratorExpression test into a third part.Stephen Kelly2013-06-283-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid command lines beyond NMake limits. http://open.cdash.org/testDetails.php?test=196577461&build=2949683 expanded command line '...' too long
generated by cgit v0.12 at 2024-09-22 07:29:28 (GMT)