summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Xcode: Control emission of EFFECTIVE_PLATFORM_NAMEGregor Jasny2017-01-2010-4/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building with multiple SDKs within one project Xcode requires the usage of ${EFFECTIVE_PLATFORM_NAME} to put temporary and build outout into separate directories. For example an iOS device and simulator build use two different SDKs (iphoneos and iphonesimulator). In the past cmake tries to detect embedded toolchains that could possibly use simulators and emitted EFFECTIVE_PLATFORM_NAME (EPN) at the proper locations. In #16253 Mark noticed that if he uses macosx and iphoneos in combination the necessary EPN is not emitted. This is because CMake by default assumes macosx SDK which does not trigger EPN emission. The fist naive approach - enabling EPN unconditionally revealed that then the EPN leaks into generator expressions like $<TARGET_FILE:xxx> which might be a regression and thus is unacceptable. The next approach was to add an CMake property to enable EPN emission unconditionally. This solved the reported problem. But the EPN leakage also happened for the embedded toolchains already without anyone noticing. So the control property was turned into a tri-state one: * No definition: EPN is activated for embedded toolchains like before * ON: EPN is always emitted * OFF: EPN is never emitted That approach gives the user the chance to disable EPN for embedded toolchains and restores generator expression functionality for those. Closes: #16253
* CMake Nightly Date StampKitware Robot2017-01-181-1/+1
|
* Merge topic 'cmCTestBuildHandler-fix-warning'Brad King2017-01-171-1/+1
|\ | | | | | | | | f3864452 cmCTestBuildHandler: Fix warning in FragmentCompare signature
| * cmCTestBuildHandler: Fix warning in FragmentCompare signatureBrad King2017-01-161-1/+1
| | | | | | | | | | | | | | | | | | ``` warning: the specified comparator type does not provide a const call operator [-Wuser-defined-warnings] ``` Reported-by: Sean McBride <sean@rogue-research.com>
* | Merge topic 'update-kwsys'Brad King2017-01-173-7/+60
|\ \ | | | | | | | | | | | | | | | ee77941a Merge branch 'upstream-KWSys' into update-kwsys 219c7bdc KWSys 2017-01-16 (a423d829)
| * \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-01-163-7/+60
| |\ \ | | |/ | |/| | | | | | | * upstream-KWSys: KWSys 2017-01-16 (a423d829)
| | * KWSys 2017-01-16 (a423d829)KWSys Upstream2017-01-163-7/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit a423d82989a4b89fa7d17f3dd5215684e902208e (master). Upstream Shortlog ----------------- Ben Boeckel (1): 45db0937 SystemTools: use PathExists where appropriate Brad King (1): e08eee61 SystemTools: Fix conversion warning in test case Eric Berge (1): 687fcd79 Add -lsocket for libcmsys.a build on SunOS Gregor Jasny (1): 0541ce21 SystemTools: Fix off-by-one in GetLineFromStream with size limit
* | | Merge topic 'FindICU-include-dirs'Brad King2017-01-171-0/+1
|\ \ \ | | | | | | | | | | | | | | | | cdf7e5d8 FindICU: Add 'include' to the path suffixes
| * | | FindICU: Add 'include' to the path suffixesFlorent Castelli2017-01-161-0/+1
| | | | | | | | | | | | | | | | Without this FindICU doesn't recognise the installation within homebrew.
* | | | Merge topic 'findhdf5-libraries-targets'Brad King2017-01-171-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5201a306 FindHDF5: use the target rather than the path
| * | | | FindHDF5: use the target rather than the pathBen Boeckel2017-01-161-4/+4
| | |/ / | |/| | | | | | | | | | | | | | On Windows, the `LOCATION` property gets the path to the `.dll` rather than the `.lib` which is unsuitable for linking.
* | | | Merge topic 'fixtureUnusedOrdering'Brad King2017-01-174-22/+76
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 298b5b31 CTest: Ensure setup/cleanup ordering even when fixture not required
| * | | | CTest: Ensure setup/cleanup ordering even when fixture not requiredCraig Scott2017-01-164-22/+76
| | | | | | | | | | | | | | | | | | | | Closes: #16558
* | | | | Merge topic 'file-GLOB-empty-no-crash'Brad King2017-01-173-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2bba0bfc file: Fix crash on GLOB with no expressions after LIST_DIRECTORIES
| * | | | | file: Fix crash on GLOB with no expressions after LIST_DIRECTORIESBrad King2017-01-163-1/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.3.0-rc1~318^2~1 (file: Teach GLOB to list directories optionally, 2015-03-17) using `LIST_DIRECTORIES` followed by no expression causes a crash. Fix the logic to avoid the crash. Fixes: #16565
* | | | | Merge topic 'expand_custom_commands'Brad King2017-01-1713-26/+146
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7c8ab7dd add_custom_{command,target}: Add COMMAND_EXPAND_LISTS option
| * | | | | add_custom_{command,target}: Add COMMAND_EXPAND_LISTS optionEd Branch2017-01-1413-26/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option allows lists generated by generator expressions to be expanded. Closes: #15935
* | | | | | CMake Nightly Date StampKitware Robot2017-01-171-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'source_group-tree'Brad King2017-01-1610-3/+227
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b42330be source_group: Add options create groups matching directory tree
| * | | | | source_group: Add options create groups matching directory treeMateusz Janek2017-01-1610-3/+227
| | | | | | | | | | | | | | | | | | | | | | | | Add `TREE` and `PREFIX` arguments to enable this behavior.
* | | | | | Merge topic 'csharp_simple'Brad King2017-01-1613-80/+442
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 397b8546 VS: added documentation for C# support a7dd8e66 VS: added support for C# (for Visual Studio 2010, 2012, 2013, 2015) 6fda6005 VS: renamed target property VS_USER_PROPS_CXX to VS_USER_PROPS
| * | | | | | VS: added documentation for C# supportMichael Stürmer2017-01-131-0/+25
| | | | | | |
| * | | | | | VS: added support for C# (for Visual Studio 2010, 2012, 2013, 2015)Michael Stürmer2017-01-138-73/+411
| | | | | | |
| * | | | | | VS: renamed target property VS_USER_PROPS_CXX to VS_USER_PROPSMichael Stürmer2017-01-135-7/+6
| | | | | | |
* | | | | | | Merge topic 'Autogen_Config'Brad King2017-01-163-340/+451
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb670d96 Autogen: Generators: Remove space 3f86032b Autogen: Generators: Rename requiresMocing method f24e1d37 Autogen: Generators: Fix clang-tidy readability-else-after-return f27c5852 Autogen: Initializer: Add old settings file to clean files d7d2cb48 Autogen: Generators: Save the UIC/RCC settings that were actually used 721997a7 Autogen: Generators: Dedicated generateAll variables for MOC/UIC/RCC 9f47d326 Autogen: Generators: Save the MOC settings that were actually used 597124ba Autogen: Generators: Add function to read makefile definitions config aware 2b400b24 Autogen: Generators: Move moc/uic/rcc executable test to generate method edf0b8a5 Autogen: Generators: Rename GenerateFoo methods to FooGenerate 06430919 Autogen: Generators: Use FileAbsentOrOlder for UIC tests ca179f2a Autogen: Generators: Use FileAbsentOrOlder for MOC tests 119791ae Autogen: Generators: Introduce FileAbsentOrOlder function 95e4cfc5 Autogen: Generators: Simplify (and fix) JoinExts function 6c55755b Autogen: Generators: Make class static method a source static function 1491ab1c Autogen: Generators: Make class static method a source static function ...
| * | | | | | | Autogen: Generators: Remove spaceSebastian Holtermann2017-01-121-1/+0
| | | | | | | |
| * | | | | | | Autogen: Generators: Rename requiresMocing methodSebastian Holtermann2017-01-122-5/+5
| | | | | | | |
| * | | | | | | Autogen: Generators: Fix clang-tidy readability-else-after-returnSebastian Holtermann2017-01-121-5/+5
| | | | | | | |
| * | | | | | | Autogen: Initializer: Add old settings file to clean filesSebastian Holtermann2017-01-121-0/+8
| | | | | | | |
| * | | | | | | Autogen: Generators: Save the UIC/RCC settings that were actually usedSebastian Holtermann2017-01-122-31/+118
| | | | | | | |
| * | | | | | | Autogen: Generators: Dedicated generateAll variables for MOC/UIC/RCCSebastian Holtermann2017-01-122-7/+11
| | | | | | | |
| * | | | | | | Autogen: Generators: Save the MOC settings that were actually usedSebastian Holtermann2017-01-122-52/+59
| | | | | | | |
| * | | | | | | Autogen: Generators: Add function to read makefile definitions config awareSebastian Holtermann2017-01-121-57/+47
| | | | | | | |
| * | | | | | | Autogen: Generators: Move moc/uic/rcc executable test to generate methodSebastian Holtermann2017-01-121-12/+18
| | | | | | | |
| * | | | | | | Autogen: Generators: Rename GenerateFoo methods to FooGenerateSebastian Holtermann2017-01-122-29/+30
| | | | | | | |
| * | | | | | | Autogen: Generators: Use FileAbsentOrOlder for UIC testsSebastian Holtermann2017-01-121-4/+6
| | | | | | | |
| * | | | | | | Autogen: Generators: Use FileAbsentOrOlder for MOC testsSebastian Holtermann2017-01-121-4/+7
| | | | | | | |
| * | | | | | | Autogen: Generators: Introduce FileAbsentOrOlder functionSebastian Holtermann2017-01-122-26/+30
| | | | | | | |
| * | | | | | | Autogen: Generators: Simplify (and fix) JoinExts functionSebastian Holtermann2017-01-121-11/+9
| | | | | | | |
| * | | | | | | Autogen: Generators: Make class static method a source static functionSebastian Holtermann2017-01-122-21/+20
| | | | | | | |
| * | | | | | | Autogen: Generators: Make class static method a source static functionSebastian Holtermann2017-01-122-39/+35
| | | | | | | |
| * | | | | | | Autogen: Generators: Static function upper case renameSebastian Holtermann2017-01-121-3/+3
| | | | | | | |
| * | | | | | | Autogen: Generators: Static function upper case renameSebastian Holtermann2017-01-121-3/+3
| | | | | | | |
| * | | | | | | Autogen: Generators: Sort methods by taskSebastian Holtermann2017-01-122-150/+157
| | | | | | | |
* | | | | | | | Merge topic 'fast-local-and-strip-install'Brad King2017-01-161-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b63ce86 Makefiles: Make fast local and strip install truly fast
| * | | | | | | | Makefiles: Make fast local and strip install truly fastMike Gelfand2017-01-131-2/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a Makefiles generator, `install/local/fast` and `install/strip/fast` targets are not at all fast. They depend on `install/local` and `install/strip` targets respectively instead of `preinstall/fast` and don't contain any commands instead of repeating commands in `install/local` and `install/strip`. The issue was introduced by simple typos in commits v2.6.0~2825 (Adding install/local global target for Makefile generators, 2006-08-29) and v2.6.0~1743 (add install/strip target for makefile generators, 2007-05-18).
* | | | | | | | Merge topic 'cuda-no-def-file-for-device'Brad King2017-01-162-10/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05dbc940 CUDA: Don't use module definition `.def` files for device linking
| * | | | | | | | CUDA: Don't use module definition `.def` files for device linkingRobert Maynard2017-01-122-10/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | These files are meaningful only to the host linker.
* | | | | | | | Merge topic 'cuda_propagate_flags_when_dlink_on_executables'Brad King2017-01-1613-3/+75
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d1f9e5b CUDA: Now pass correct FLAGS when device link cuda executables. dc5051f1 CUDA: Test that CUDA flags are used when device linking executables.
| * | | | | | | | CUDA: Now pass correct FLAGS when device link cuda executables.Robert Maynard2017-01-128-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we had a two issues when building cuda executables that required separable compilation. The first was that we didn't propagate FLAGS causing any -arch / -gencode flags to be dropped, and secondly generators such as ninja would use the CXX language flags instead of CUDA when the executable was mixed language.
generated by cgit v0.12 at 2025-02-04 17:26:44 (GMT)