summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | | Merge topic 'ninja_phony_targets'Brad King2013-07-017-130/+280
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 539356f Ninja: Custom Command file depends don't need to exist before building 874e171 Ninja: GlobalNinjaGenerator WriteBuild and WritePhonyBuild non static 88d27ad Add a test to expose a bug with add_custom_command and ninja.
| * | | | | | Ninja: Custom Command file depends don't need to exist before buildingRobert Maynard2013-07-012-3/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When converting custom commands for the ninja build system we need to make sure that any file dependencies that exist in the build tree are converted to phony targets. This tells ninja that these files might not exist when starting the build, but could be generated during the build. This is done by tracking all dependencies for custom command targets. After all have been written out we remove all items from the set that have been seen as a target, custom command output, an alias, or a file in the source directory. Anything that is left is considered to be a file that will be generated as a side effect of another custom command.
| * | | | | | Ninja: GlobalNinjaGenerator WriteBuild and WritePhonyBuild non staticRobert Maynard2013-07-016-127/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To properly track the usage of dependencies that are generated at compile time as the side effect of other build steps we need to make the WriteBuild and WritePhonyBuild commands non static
| * | | | | | Add a test to expose a bug with add_custom_command and ninja.Robert Maynard2013-06-251-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja Generator is unable to handle an add_custom_command having a dependency that is generated at build time by a previous target.
* | | | | | | Merge topic 'compiler-version-genex'Brad King2013-07-014-1/+130
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47a8db5 Add generator expressions for compiler versions.
| * | | | | | | Add generator expressions for compiler versions.Stephen Kelly2013-06-284-1/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New generator expressions allow retrieval of the version per language, as well as equality comparison.
* | | | | | | | Merge topic 'curl-bug-1192'Brad King2013-07-017-58/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e643e02 cmcurl: Backport curl bug 1192 fix (#14250)
| * | | | | | | | cmcurl: Backport curl bug 1192 fix (#14250)Brad King2013-06-277-58/+9
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LLVM headers define strlcat as a macro rather than as a function. See upstream Curl issue: http://curl.haxx.se/bug/view.cgi?id=1192 It was addressed by removing use of strlcat altogether. Port the upstream fix to CMake's curl.
* | | | | | | | CMake Nightly Date StampKitware Robot2013-07-011-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2013-06-301-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2013-06-291-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge topic 'refactor-compile-options'Brad King2013-06-2815-183/+111
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d221eac Refactor target COMPILE_OPTIONS and COMPILE_FLAGS handling b6385ca Escape target flags taken from COMPILE_OPTIONS 0c9cc9a Embarcadero: Use response files only for includes, objects, and libs
| * | | | | | Refactor target COMPILE_OPTIONS and COMPILE_FLAGS handlingBrad King2013-06-279-171/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the cmLocalGenerator GetCompileOptions method with an AddCompileOptions method since all call sites of the former simply append the result to a flags string anyway. Add a "lang" argument to AddCompileOptions and move the CMAKE_<LANG>_FLAGS_REGEX filter into it. Move the call sites in each generator to a location that has both the language and configuration available. In the Makefile generator this also moves the flags from build.make to flags.make where they belong.
| * | | | | | Escape target flags taken from COMPILE_OPTIONSBrad King2013-06-277-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor appending of individual flags out into an AppendFlagEscape method in cmLocalGenerator and teach it to use EscapeForShell. Update all COMPILE_OPTIONS handling to use AppendFlagEscape. Override the method in the Xcode generator to use its custom escape implementation. Teach the CompileOptions test to add an option that requires escaping everywhere instead of just with the GNU tools.
| * | | | | | Embarcadero: Use response files only for includes, objects, and libsBrad King2013-06-271-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leave other flags directly in the Makefile command lines and outside any special inline response file syntax. Otherwise Borland does not support flags with quotes in response files.
* | | | | | | Merge topic 'update-kwsys'Brad King2013-06-281-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 063617c Merge branch 'upstream-kwsys' into update-kwsys 045fc84 KWSys 2013-06-24 (3d1d4e7c)
| * \ \ \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-06-261-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | KWSys 2013-06-24 (3d1d4e7c)KWSys Robot2013-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 3d1d4e7c | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' d79a792e..3d1d4e7c Cory Quammen (1): 3d1d4e7c SystemTools: MakeDirectory() reports failure if path is file Change-Id: I080ed62630304c63c65efaf4be08198a6411ae48
* | | | | | | | | Merge topic 'doc-ENV-syntax'Brad King2013-06-281-0/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c293e05 Document ENV syntax as a "variable" (#14245)
| * | | | | | | | | Document ENV syntax as a "variable" (#14245)Brad King2013-06-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although "ENV" is not a special variable itself, use it to document the $ENV{VAR} syntax.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2013-06-281-1/+1
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2013-06-271-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge topic 'dag-LINKER_LANGUAGE'Brad King2013-06-2613-4/+65
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff015ee Genex: Report error if a target file is needed to evaluate link libraries. b58aff9 Genex: Extend EvaluatingLinkLibraries to also check the top target name. b1c19ce Genex: Make LINK_LANGUAGE report an error when evaluating link libraries. 0e1cb07 Add missing return after error report.
| * | | | | | | | Genex: Report error if a target file is needed to evaluate link libraries.Stephen Kelly2013-06-247-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Constructs such as target_link_libraries(foo $<$<STREQUAL:$<TARGET_FILE:foo>,foo.so>:bar>) segfault before this patch.
| * | | | | | | | Genex: Extend EvaluatingLinkLibraries to also check the top target name.Stephen Kelly2013-06-242-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow testing whether we are evaluating the link libraries of a particular target.
| * | | | | | | | Genex: Make LINK_LANGUAGE report an error when evaluating link libraries.Stephen Kelly2013-06-246-1/+27
| | | | | | | | |
| * | | | | | | | Add missing return after error report.Stephen Kelly2013-06-241-0/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'FindFreetype-gtkmm'Brad King2013-06-261-4/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a34839d FindFreetype: Detect Freetype installed by GtkMM installer for win
| * | | | | | | | | FindFreetype: Detect Freetype installed by GtkMM installer for winDaniele E. Domenichelli2013-06-211-4/+13
| | | | | | | | | |
* | | | | | | | | | Merge topic 'version-compare-genex'Brad King2013-06-266-41/+92
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e605528 Add generator expressions for version comparision. 48bb48e De-duplicate version comparison code.
| * | | | | | | | | Add generator expressions for version comparision.Stephen Kelly2013-06-124-0/+78
| | | | | | | | | |
generated by cgit v0.12 at 2024-10-20 23:40:40 (GMT)