reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-19 11:00:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
31,915 Commits 4 Branches 185 Tags
Commit Graph

31915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
5889eb43ea Merge topic 'ice-debug' 
86bcdbcd FindIce: Support finding both release and debug libraries
 2016-06-17 11:06:42 -04:00
Brad King
44f81be934 Merge topic 'CodeBlocks-generated-sources' 
afd6cc6b CodeBlocks: Show generated files in non-utility targets
 2016-06-17 11:06:40 -04:00
Brad King
9ef7ccdcf9 Merge topic 'CodeBlocks-include-order' 
76b462ea cmExtraCodeBlocksGenerator: Do not shuffle include directories
 2016-06-17 11:06:37 -04:00
Tobias Hunger
76b462eacb cmExtraCodeBlocksGenerator: Do not shuffle include directories 
Report include directories in a sensible order. Do not shuffle them
when trying to make them unique.
 2016-06-17 10:37:29 -04:00
Kitware Robot
d4283ca18b CMake Nightly Date Stamp 2016-06-17 00:01:07 -04:00
Enrico Bedau
afd6cc6b92 CodeBlocks: Show generated files in non-utility targets 
Since 2.6.3 the UTILITY target may have source files. A defect was filed
that these files are now visible in the source tree. A fix later removed
all generated files from the source tree, regardless of the target type.
You can't even include them by using the SOURCES option. This fix adds
generated files again, except for the UTILITY target which cluttered the
source tree.

Fixes #14272.
 2016-06-16 09:55:29 -04:00
Brad King
f3d76a88b7 Merge topic 'ice-3.6.2' 
82ecc2a3 FindIce: Add versions 3.6.1 and 3.6.2
 2016-06-16 09:52:58 -04:00
Brad King
a854e1795f Merge topic 'cmOutputConverter-stringstream' 
d645b03e cmOutputConverter: implement Shell__GetArgument using ostringstream
 2016-06-16 09:46:56 -04:00
Brad King
0e523d0612 Merge topic 'cleanup-streams' 
ed5fa48d cmXMLWriter: use ifstream from KWSys
24ab29b8 Prefer istringstream and ostringstream over stringstream.
ab8b77dd Remove redundant arguments from fstream constructors
eb79fa72 Access std::ios_base with std::ios
 2016-06-16 09:46:54 -04:00
Brad King
993991a07d Merge topic 'findcuda-use-correct-runtime-for-required' 
90d114ed FindCUDA: Use the correct runtime in REQUIRED_VARS check
 2016-06-16 09:46:52 -04:00
Brad King
290913fab8 Merge topic 'iwyu-preparation' 
1c2c6297 cmTargetLinkLibraryType: Extract from cmStandardIncludes.h
ffdc0a8e cmTypeMacro: Extract from cmStandardIncludes.h
e4eb88e2 cmCustomCommandLines: Extract from cmStandardIncludes.h
535ec2bf cmDocumentationEntry: Extract from cmStandardIncludes
c3819aca cmConfigure.h: Establish as 'include first' file
 2016-06-16 09:46:49 -04:00
Brad King
84c0fdb192 Merge topic 'clean-up-cmMakefile-IssueMessage' 
5bbcf758 cmIfCommand: Don't rely on NestedError logic to issue messages
262ce91e cmMakefile: Extract invoke result variables
 2016-06-16 09:46:47 -04:00
Brad King
2701b519b1 Merge topic 'clean-up-Parser' 
905e738f Parser: Out-of-line conditional code to cmMakefile
0a9094cd Parser: Issue file open error messages through dedicated API
 2016-06-16 09:46:44 -04:00
Brad King
ce62454019 Merge topic 'find_package-duplicate-search-paths' 
919db25c cmFindPackageCommand: remove duplicate paths from error message
ebf18df5 cmFindPackageCommand: use iterators to loop over configurations
 2016-06-16 09:46:42 -04:00
Daniel Pfeifer
1c2c629769 cmTargetLinkLibraryType: Extract from cmStandardIncludes.h 2016-06-16 09:26:50 -04:00
Daniel Pfeifer
ffdc0a8e28 cmTypeMacro: Extract from cmStandardIncludes.h 2016-06-16 09:26:33 -04:00
Daniel Pfeifer
e4eb88e21d cmCustomCommandLines: Extract from cmStandardIncludes.h 2016-06-16 09:25:22 -04:00
Roger Leigh
86bcdbcde5 FindIce: Support finding both release and debug libraries 
Search for both release and debug library variants, and use
SelectLibraryConfigurations to choose the appropriate
library.  Also add both release and debug libraries to the
imported targets.
 2016-06-16 12:23:37 +01:00
Kitware Robot
83ae79442c CMake Nightly Date Stamp 2016-06-16 00:01:06 -04:00
Daniel Pfeifer
d645b03e9c cmOutputConverter: implement Shell__GetArgument using ostringstream 
This removes the need to calculate the resulting string length
beforehand.
 2016-06-15 23:44:37 +02:00
Roger Leigh
82ecc2a3a8 FindIce: Add versions 3.6.1 and 3.6.2 2016-06-15 15:35:06 +01:00
Kitware Robot
909d51bece CMake Nightly Date Stamp 2016-06-15 00:01:06 -04:00
Daniel Pfeifer
ed5fa48d50 cmXMLWriter: use ifstream from KWSys 2016-06-14 23:26:16 +02:00
Daniel Pfeifer
24ab29b882 Prefer istringstream and ostringstream over stringstream. 
Use istringsream for parsing, ostringstream for generation.
 2016-06-14 22:37:36 +02:00
Daniel Pfeifer
ab8b77dd33 Remove redundant arguments from fstream constructors 
Don't pass the default value of the openmode parameter explicitly.
 2016-06-14 22:28:55 +02:00
Daniel Pfeifer
eb79fa7260 Access std::ios_base with std::ios 
Just because it is shorter.
 2016-06-14 22:23:08 +02:00
Chuck Atkins
90d114ed8c FindCUDA: Use the correct runtime in REQUIRED_VARS check 
When enabling the CUDA static runtime, the current module always uses
the shared runtime in the REQUIRED_VARS check.  This change should
select the correct runtime to be checked for as required based on the
CUDA_USE_STATIC_CUDA_RUNTIME option.

Fixes #16096
 2016-06-14 09:55:35 -04:00
Kitware Robot
33f74dc524 CMake Nightly Date Stamp 2016-06-14 00:01:10 -04:00
Daniel Pfeifer
535ec2bf1a cmDocumentationEntry: Extract from cmStandardIncludes 2016-06-13 22:41:29 +02:00
Daniel Pfeifer
c3819acad2 cmConfigure.h: Establish as 'include first' file 
At the moment, cmStandardIncludes.h needs to be included before any
standard includes because it disables some warnings that are caused
by the standard library of some compilers.  Move this responsibility
to the cmConfigure.h file.

Also add include guards to cmConfigure.h to make sure the file can be
included multiple times.
 2016-06-13 22:37:28 +02:00
Brad King
1bafa0b3f5 Merge topic 'parent-scope-docs' 
42fe7d21 Help: clarify PARENT_SCOPE behavior
 2016-06-13 15:19:45 -04:00
Stephen Kelly
5bbcf758a1 cmIfCommand: Don't rely on NestedError logic to issue messages 2016-06-13 20:20:44 +02:00
Stephen Kelly
262ce91e8a cmMakefile: Extract invoke result variables 
Make it more clear what is happening here.
 2016-06-13 20:20:44 +02:00
Stephen Kelly
905e738ffe Parser: Out-of-line conditional code to cmMakefile 
Simplify parser API.
 2016-06-13 20:19:16 +02:00
Stephen Kelly
0a9094cd10 Parser: Issue file open error messages through dedicated API 2016-06-13 20:19:16 +02:00
Brad King
8d80c8961f Merge branch 'release' 2016-06-13 13:36:53 -04:00
Ben Boeckel
919db25c3b cmFindPackageCommand: remove duplicate paths from error message 
Fixes #15252.
 2016-06-13 11:16:12 -04:00
Ben Boeckel
ebf18df580 cmFindPackageCommand: use iterators to loop over configurations 2016-06-13 11:16:10 -04:00
Brad King
0514fa2398 Merge branch 'release' 2016-06-13 10:28:44 -04:00
Brad King
9f3546bbb4 CMake 3.6.0-rc2 v3.6.0-rc2 2016-06-13 10:28:02 -04:00
Brad King
473634eb1c Merge topic 'expose-cache-properties' 
63c0e92c cmState: Expose list of properties of values in the cache
6eee2463 cmCacheEntry: Retrieve all properties of cache entries
120899c6 cmPropertyList: Add a way to retrieve all properties
7066218e cmake: Kill cmake::CacheManager and its getter
 2016-06-13 10:03:05 -04:00
Ben Boeckel
42fe7d2150 Help: clarify PARENT_SCOPE behavior 
Fixes #15093.
 2016-06-13 09:55:17 -04:00
Brad King
4e66ca1952 Merge topic 'fix-cmake-ISP-violation' 
23f87e81 cmake: Remove force from IssueMessage API
54c65d5f cmake: Extract DisplayMessage API.
 2016-06-13 09:54:27 -04:00
Brad King
18e00ac7b9 Merge topic 'avoid-cmMakefile-IssueMessage-after-configure' 
ea5324cd cmMakefile: Port messages for compile features to cmake
df8c3130 cmGlobalGenerator: Don't use cmMakefile::IssueMessage after configure
946d1e50 cmMakefile: Avoid IssueMessage after configure is finished
096c7754 cmLocalGenerator: Store Backtrace for the directory
 2016-06-13 09:54:24 -04:00
Brad King
3b14a4bca4 Merge topic 'fix-Message-API-ISP-violation' 
0a4af073 cmake: Issue message independent of cmMakefile definition
 2016-06-13 09:54:20 -04:00
Brad King
941fbe31f5 Merge topic 'find-lib32' 
896ad251 Teach find_library and find_package to search lib32 paths (#11260)
 2016-06-13 09:54:17 -04:00
Brad King
ff1cce464d Merge topic 'add-braces' 
757b0ff5 Add missing braces around statements in header files
a16bf141 Add missing braces around statements.
bd9e551c PseudoMemcheck: revise style with clang-format.
 2016-06-13 09:54:14 -04:00
Brad King
6b0ab86eb5 Merge topic 'bash-completion' 
797c3c54 bash-completion: Add cpack --help-{manual,module,policy,property}
b08cae9b bash-completion: Add ctest --help-{manual,module,policy,property,variable}
48cb388e bash-completion: Fix cmake --help-policy lookup
f67afbdc bash-completion: Add cmake --help-manual
 2016-06-13 09:54:11 -04:00
Brad King
7ce354d3ac Merge topic 'refactor-cmLocalGenerator-flags' 
f62ed322 cmLocalGenerator: Add GetTargetDefines to get all defines for a target
853b1bb4 cmLocalGenerator: Constify AppendDefines and AddCompileDefinitions
 2016-06-13 09:54:09 -04:00
Kitware Robot
06ee543c00 CMake Nightly Date Stamp 2016-06-13 00:01:05 -04:00