summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
Commit message (Collapse)AuthorAgeFilesLines
* cmState: Move TargetType enum to separate namespaceStephen Kelly2016-10-191-52/+54
|
* Merge topic 'vs-host-x64-tools'Brad King2016-10-141-0/+9
|\ | | | | | | | | | | d079e71c VS: Provide an option to use x64 host tools 779939a0 Help: Document VS and Xcode toolset selection
| * VS: Provide an option to use x64 host toolsBrad King2016-10-141-0/+9
| | | | | | | | | | | | | | | | | | | | Visual Studio provides toolchains that are themselves built for 32-bit or 64-bit host architectures. By default it uses the 32-bit tools, but it can be told to prefer the 64-bit tools on 64-bit hosts. Extend the `CMAKE_GENERATOR_TOOLSET` specification to provide a way to request use of the 64-bit host tools. Closes: #15622
* | Merge topic 'vs15-separate-flag-table'Brad King2016-10-131-2/+9
|\ \ | |/ |/| | | | | b1d67ae8 VS: Split flag table between v140 and v141 toolsets
| * VS: Split flag table between v140 and v141 toolsetsBrad King2016-10-101-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | In commit v3.7.0-rc1~156^2~1 (VS: Update v140 flag tables from VS 15 MSBuild files, 2016-09-02) we extended the v140 flag table with values from the v141 toolset that comes with VS 15. However, the v140 toolset that comes with VS 14 does not have all of these entries and so the flags just need to be passed without special mapping. In order to support both toolsets, split our CL flag table into separate copies for each version and switch off the toolset name. Closes: #16352
* | VS: Use absolute target-specific directory for `resources.pri`Roman Wüger2016-10-051-2/+4
|/ | | | | | | | The change in commit v3.7.0-rc1~219^2 (VS: Use target-specific directory for `resources.pri`, 2016-08-25) incorrectly specifies a relative path for the `ProjectPriFullPath` value. Fix it to use an absolute path. Issue: #16106
* Merge topic 'vs-clang-llvm-support'Brad King2016-09-291-1/+2
|\ | | | | | | | | 3f300b84 VS: Recognize VS/LLVM toolset names as Clang
| * VS: Recognize VS/LLVM toolset names as ClangRoman Wüger2016-09-281-1/+2
| | | | | | | | | | | | Update the toolset name matching added by commit v3.6.0-rc1~279^2~10 (VS: in Clang/C2 toolset, setup correct compiler settings, 2016-02-18) to match VS/LLVM toolset names too.
* | Simplify CMake per-source license noticesBrad King2016-09-271-11/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | Per-source copyright/license notice headers that spell out copyright holder names and years are hard to maintain and often out-of-date or plain wrong. Precise contributor information is already maintained automatically by the version control tool. Ultimately it is the receiver of a file who is responsible for determining its licensing status, and per-source notices are merely a convenience. Therefore it is simpler and more accurate for each source to have a generic notice of the license name and references to more detailed information on copyright holders and full license terms. Our `Copyright.txt` file now contains a list of Contributors whose names appeared source-level copyright notices. It also references version control history for more precise information. Therefore we no longer need to spell out the list of Contributors in each source file notice. Replace CMake per-source copyright/license notice headers with a short description of the license and links to `Copyright.txt` and online information available from "https://cmake.org/licensing". The online URL also handles cases of modules being copied out of our source into other projects, so we can drop our notices about replacing links with full license text. Run the `Utilities/Scripts/filter-notices.bash` script to perform the majority of the replacements mechanically. Manually fix up shebang lines and trailing newlines in a few files. Manually update the notices in a few files that the script does not handle.
* Convert: Move access to CurrentBinaryDirectory out of loopsStephen Kelly2016-09-191-1/+3
|
* Convert: Avoid START_OUTPUT enum when converting to relative pathsStephen Kelly2016-09-191-1/+1
|
* Merge topic 'vs14-debug-enum-older-toolsets'Brad King2016-09-021-1/+3
|\ | | | | | | | | 9998774f VS: Fix VS 2015 .vcxproj debug setting for v80 toolset
| * VS: Fix VS 2015 .vcxproj debug setting for v80 toolsetBrad King2016-09-011-1/+3
| | | | | | | | Closes: #16281
| * VS: Fix VS 2015 .vcxproj debug setting for Windows7.1SDK toolsetBrad King2016-08-051-4/+7
| | | | | | | | Closes: #16213
* | Merge topic 'cleanup-Convert'Brad King2016-08-301-3/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4332131d Convert: Make variables a bit more clear 5aca066c Convert: Remove UNCHANGED enum value 146bf926 Convert: Remove 'FULL' conversion 58ba87f8 Convert: Replace Convert(FULL) with equivalent e80314d7 Ninja: Replace ternary with if() 563ac22a Convert: Replace trivial conversion with new method 08be47cf Convert: Replace UNCHANGED conversions with new API call 564d3a1d Convert: Extract ConvertToRelativePath from Convert() 95a659f1 Convert: Replace FULL conversions with equivalent a8c7ccb1 VS: Replace FULL/UNCHANGED conversion with equivalent 5ad25ef4 Convert: Remove NONE conversion ac463841 Convert: Replace uses of Convert(NONE) 998d9ee9 VS: Replace variable with an if() ee49f006 Makefiles: Replace ternaries with if()s 51f7dcb0 Makefiles: Inline MakeLauncher into only caller ba4ba7c3 Makefiles: Simplify MakeLauncher return value ...
| * | Convert: Replace UNCHANGED conversions with new API callStephen Kelly2016-08-271-3/+2
| | |
* | | Merge topic 'vs-NsightTegra-empty-version'Brad King2016-08-301-5/+4
|\ \ \ | |/ / |/| | | | | | | | 1f4aeb17 VS: Fix out-of-bounds write on empty Nsight Tegra version
| * | VS: Fix out-of-bounds write on empty Nsight Tegra versionFujii Hironori2016-08-261-5/+4
| |/ | | | | | | | | | | In cmVisualStudio10TargetGenerator::cmVisualStudio10TargetGenerator, wrote 0 to this->NsightTegraVersion[-1] if sscanf returns -1 which is the case of GetNsightTegraVersion is empty.
* | VS: Use target-specific directory for `resources.pri`Brad King2016-08-251-3/+3
| | | | | | | | | | | | | | Set the `ProjectPriFullPath` field to a value that is unique to each target and not shared with others in order to avoid collisions. Closes: #16106
* | Merge topic 'vs14-debug-enum-older-toolsets'Brad King2016-08-081-5/+5
|\ \ | | | | | | | | | | | | 038e3a4f cmVisualStudio10TargetGenerator: Run clang-format
| * | cmVisualStudio10TargetGenerator: Run clang-formatBrad King2016-08-051-5/+5
| | |
* | | Merge topic 'vs14-debug-enum-older-toolsets'Brad King2016-08-051-1/+4
|\ \ \ | |/ / | | | | | | | | | 4ada475e VS: Fix VS 2015 .vcxproj debug setting for Windows7.1SDK toolset
| * | VS: Fix VS 2015 .vcxproj debug setting for Windows7.1SDK toolsetBrad King2016-08-041-1/+4
| |/ | | | | | | Closes: #16213
* | VS: Handle VS_GLOBAL_RootNamespace special caseBenjamin Ballet2016-07-201-1/+3
| | | | | | | | | | | | | | | | Although we provide a `VS_GLOBAL_ROOTNAMESPACE` option to both set the `RootNamespace` value and reference it, some users may try to set `VS_GLOBAL_RootNamespace` to set `RootNamespace` as a variant of the `VS_GLOBAL_<variable>` property. In this case we still need to add the reference to `$(RootNamespace)`.
* | VS: Add support for NATVIS filesRobert Dailey2016-07-151-0/+2
| | | | | | | | | | | | | | | | Add an explicit `<Natvis>` element in VS project files for `*.natvis` files. These enable custom debug visualizers for project-specific types. Fixes #16043.
* | Merge topic 'vs14-debug-enum-older-toolsets'Brad King2016-07-141-1/+2
|\ \ | |/ | | | | | | 36fc3a53 VS: Fix VS 2015 .vcxproj debug setting for v90 toolset (#15986)
| * VS: Fix VS 2015 .vcxproj debug setting for v90 toolset (#15986)Brad King2016-07-131-1/+2
| |
* | Windows: Honor WINDOWS_EXPORT_ALL_SYMBOLS for executables with exportsYury Zhuravlev2016-07-111-2/+4
| | | | | | | | | | For executables with ENABLE_EXPORTS set, export all symbols when instructed to do so by WINDOWS_EXPORT_ALL_SYMBOLS.
* | Avoid using KWSys auto_ptr by adopting it ourselvesBrad King2016-06-291-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | Replace use of cmsys::auto_ptr with a CM_AUTO_PTR macro that maps to our own implementation adopted from the KWSys auto_ptr implementation. Later we may be able to map CM_AUTO_PTR to std::auto_ptr on compilers that do not warn about it. Automate the client site conversions: git grep -l auto_ptr -- Source/ | grep -v Source/kwsys/ | xargs sed -i \ 's|cmsys::auto_ptr|CM_AUTO_PTR|;s|cmsys/auto_ptr.hxx|cm_auto_ptr.hxx|'
* | Merge topic 'vs-tool-override'Brad King2016-06-231-0/+5
|\ \ | | | | | | | | | | | | ed05f11d VS: Add a VS_TOOL_OVERRIDE source file property
| * | VS: Add a VS_TOOL_OVERRIDE source file propertyGilles Khouzam2016-06-201-0/+5
| |/ | | | | | | | | | | | | | | This property allow to specify a specific Visual Studio tool for a source file overriding the default tool behavior. For example, a `.resw` file being processed as a `PriResource` file. This has the advantage of being able to teach CMake to process new file types without code modifications.
* | VS: Add VS_SDK_REFERENCES target property to reference external SDKsGilles Khouzam2016-06-221-1/+21
|/ | | | | Allow one to specify external SDK references such as `Microsoft.AdMediatorWindows81, Version=1.0`.
* Merge topic 'improve-character-find-and-replace'Brad King2016-05-251-1/+1
|\ | | | | | | | | | | | | | | 5784747d Improve string find: prefer character overloads. 5cec953e Use std::replace for replacing chars in strings. 2a1a2033 cmExtraEclipseCDT4Generator: use std::replace. 34bc6e1f cmCTestScriptHandler: don't call find repeatedly.
| * Use std::replace for replacing chars in strings.Daniel Pfeifer2016-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | Find uses of `cmSystemTools::ReplaceString` where both `replace` and `with` are string literals with a size of one. Automate with: git grep -l ReplaceString | xargs sed -i "s|cmSystemTools::ReplaceString(\([^,]*\), \"\(.\)\", \"\(.\)\");|std::replace(\1.begin(), \1.end(), '\2', '\3');|g" git grep -l ReplaceString | xargs sed -i "s|cmSystemTools::ReplaceString(\([^,]*\), \"\(.\)\", \"\\\\\\\\\");|std::replace(\1.begin(), \1.end(), '\2', '\\\\\\\\');|g" git grep -l ReplaceString | xargs sed -i "s|cmSystemTools::ReplaceString(\([^,]*\), \"\\\\\\\\\", \"\(.\)\");|std::replace(\1.begin(), \1.end(), '\\\\\\\\', '\2');|g"
* | Use enums defined in cmOutputConverter using their fully qualified name.Daniel Pfeifer2016-05-251-2/+2
|/ | | | | | | | | Mostly automated: values=("RelativeRoot" "NONE" "FULL" "HOME" "START" "HOME_OUTPUT" "START_OUTPUT" "OutputFormat" "UNCHANGED" "MAKERULE" "SHELL" "WATCOMQUOTE" "RESPONSE" "FortranFormat" "FortranFormatNone" "FortranFormatFixed" "FortranFormatFree") for i in "${values[@]}"; do git grep -l cmLocalGenerator::$i | xargs sed -i "s|cmLocalGenerator::$i|cmOutputConverter::$i|g"; done
* Revise C++ coding style using clang-formatKitware Robot2016-05-161-1679/+1221
| | | | | | | | | | | | | Run the `Utilities/Scripts/clang-format.bash` script to update all our C++ code to a new style defined by `.clang-format`. Use `clang-format` version 3.8. * If you reached this commit for a line in `git blame`, re-run the blame operation starting at the parent of this commit to see older history for the content. * See the parent commit for instructions to rebase a change across this style transition commit.
* Remove `//------...` horizontal separator commentsBrad King2016-05-091-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | Modern editors provide plenty of ways to visually separate functions. Drop the explicit comments that previously served this purpose. Use the following command to automate the change: $ git ls-files -z -- \ "*.c" "*.cc" "*.cpp" "*.cxx" "*.h" "*.hh" "*.hpp" "*.hxx" | egrep -z -v "^Source/cmCommandArgumentLexer\." | egrep -z -v "^Source/cmCommandArgumentParser(\.y|\.cxx|Tokens\.h)" | egrep -z -v "^Source/cmDependsJavaLexer\." | egrep -z -v "^Source/cmDependsJavaParser(\.y|\.cxx|Tokens\.h)" | egrep -z -v "^Source/cmExprLexer\." | egrep -z -v "^Source/cmExprParser(\.y|\.cxx|Tokens\.h)" | egrep -z -v "^Source/cmFortranLexer\." | egrep -z -v "^Source/cmFortranParser(\.y|\.cxx|Tokens\.h)" | egrep -z -v "^Source/cmListFileLexer\." | egrep -z -v "^Source/cm_sha2" | egrep -z -v "^Source/(kwsys|CursesDialog/form)/" | egrep -z -v "^Utilities/(KW|cm).*/" | xargs -0 sed -i '/^\(\/\/---*\|\/\*---*\*\/\)$/ {d;}' This avoids modifying third-party sources and generated sources.
* Isolate formatted streaming blocks with clang-format off/onBrad King2016-05-061-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The clang-format tool can do a good job formatting most code, but well-organized streaming blocks are best left manually formatted. Find blocks of the form os << "...\n" "...\n" ; using the command $ git ls-files -z -- Source | egrep -v -z '^Source/kwsys/' | xargs -0 pcregrep -M --color=always -B 1 -A 1 -n \ '<<[^\n]*\n(^ *("[^\n]*("|<<|;)$|;)\n){2,}' Find blocks of the form os << "...\n" << "...\n" << "...\n"; using the command $ git ls-files -z -- Source | egrep -v -z '^Source/kwsys/' | xargs -0 pcregrep -M --color=always -B 1 -A 1 -n \ '<<[^\n]*\n(^ *<<[^\n]*(\\n"|<<|;)$\n){2,}' Surround such blocks with the pair /* clang-format off */ ... /* clang-format on */ in order to protect them from update by clang-format. Use the C-style `/*...*/` comments instead of C++-style `//...` comments in order to prevent them from ever being swallowed by re-formatting of surrounding comments.
* Format include directive blocks and ordering with clang-formatBrad King2016-04-291-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort include directives within each block (separated by a blank line) in lexicographic order (except to prioritize `sys/types.h` first). First run `clang-format` with the config file: --- SortIncludes: false ... Commit the result temporarily. Then run `clang-format` again with: --- SortIncludes: true IncludeCategories: - Regex: 'sys/types.h' Priority: -1 ... Commit the result temporarily. Start a new branch and cherry-pick the second commit. Manually resolve conflicts to preserve indentation of re-ordered includes. This cleans up the include ordering without changing any other style. Use the following command to run `clang-format`: $ git ls-files -z -- \ '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' | egrep -z -v '(Lexer|Parser|ParserHelper)\.' | egrep -z -v '^Source/cm_sha2' | egrep -z -v '^Source/(kwsys|CursesDialog/form)/' | egrep -z -v '^Utilities/(KW|cm).*/' | egrep -z -v '^Tests/Module/GenerateExportHeader' | egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' | xargs -0 clang-format -i This selects source files that do not come from a third-party. Inspired-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
* Source: Stabilize include orderBrad King2016-04-291-1/+2
| | | | | Each source file has a logical first include file. Include it in an isolated block so that tools that sort includes do not move them.
* VS: in Clang/C2 toolset, setup correct compiler settingsMariusz Pluciński2016-03-101-1/+12
|
* Merge topic 'vs14-debug-enum-older-toolsets'Brad King2016-03-081-1/+2
|\ | | | | | | | | 3f15665a VS: Fix VS 2015 .vcxproj debug setting for v100 toolset (#15986)
| * VS: Fix VS 2015 .vcxproj debug setting for v100 toolset (#15986)Brad King2016-03-071-1/+2
| |
* | VS: Add option to set `ConfigurationType` of a .vcxproj fileFabian Otto2016-02-261-35/+43
| | | | | | | | | | | | Add a VS_CONFIGURATION_TYPE target property to set this value explicitly. This is useful to build a Windows Kernel Mode Driver, for example.
* | Merge topic 'vs14-debug-enum-older-toolsets'Brad King2016-02-251-0/+27
|\ \ | |/ | | | | | | dc422d27 VS: Fix VS 2015 .vcxproj debug setting for older toolsets (#15986)
| * VS: Fix VS 2015 .vcxproj debug setting for older toolsets (#15986)Brad King2016-02-241-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.4.2~2^2 (VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation, 2016-01-08) we generate invalid project files for the v110 and v120 toolsets. VS complains: C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120\Microsoft.CppCommon.targets(639,9): error MSB4030: "Debug" is an invalid value for the "GenerateDebugInformation" parameter of the "Link" task. The "GenerateDebugInformation" parameter is of type "System.Boolean". This reveals that our VS flag map selection should be based on the toolset instead of the version of VS. However, that will be a non-trivial change so for now fix this particular use case by hard-coding a correction to the flag map. Reported-by: Gregor Jasny <gjasny@googlemail.com>
* | Fix MFC setting on utility targets (#15867)Clinton Stimpson2016-01-191-6/+9
| | | | | | | | Multi-byte MFC is deprecated, and some projects will not compile if MFC is enabled.
* | Merge topic 'vs-global-properties'Brad King2016-01-121-0/+26
|\ \ | | | | | | | | | | | | af39f115 VS: Implement VS_GLOBAL_* target properties in VS 2010+ (#13666)
| * | VS: Implement VS_GLOBAL_* target properties in VS 2010+ (#13666)Mike Fitzgerald2016-01-111-0/+26
| | | | | | | | | | | | | | | These have been documented but previously only implemented for VS 2008 and below.
* | | VS: Map the link `/debug` to its IDE propertyBrad King2016-01-111-19/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the link flag table entries for this flag to be case-insensitive. Also fix the VS 2015 value for the build property enumeration name. This causes `linkOptions.Parse(...)` to correctly extract the `/debug` flag and map it to the IDE property instead. Therefore we do not need to look for the flag explicitly when initializing the property.
generated by cgit v0.12 at 2025-01-04 13:56:45 (GMT)