kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,029 Commits 1 Branch 14 Tags
Commit Graph

20691 Commits

Author SHA1 Message Date
Stephen Kelly
096c7754b3 cmLocalGenerator: Store Backtrace for the directory 
Don't rely on cmMakefile to provide that.  Use it to issue messages.
 2016-06-12 19:01:45 +02:00
Stephen Kelly
0a4af0735f cmake: Issue message independent of cmMakefile definition 
The makefile is only used when called by the cmMessageCommand, so inline
the use of it there.  It otherwise creates an undesirable dependency on
cmMakefile for issuing messages in the cmake instance, a violation of
the Interface Segregation Principle.

 https://en.wikipedia.org/wiki/Interface_segregation_principle

This also makes it more explicit that the variable definitions only
affect the message() command.  If an AUTHOR_WARNING is issued for any
other reason, it is not affected.  To affect that, it is necessary to
set the cache variable instead of the regular variable.

This is an unfortunate interface quirk, but one which can't be fixed
easily now.
 2016-06-12 18:38:33 +02:00
Kitware Robot
acf0c0f444 CMake Nightly Date Stamp 2016-06-12 00:01:09 -04:00
Daniel Pfeifer
757b0ff5dd Add missing braces around statements in header files 2016-06-11 09:49:00 +02:00
Kitware Robot
d6e99fa834 CMake Nightly Date Stamp 2016-06-11 00:01:07 -04:00
Daniel Pfeifer
a16bf141bc Add missing braces around statements. 
Apply fixits of clang-tidy's readability-braces-around-statements
checker.
 2016-06-10 18:36:24 +02:00
Daniel Scharrer
896ad251de Teach find_library and find_package to search lib32 paths (#11260) 
Add a ``FIND_LIBRARY_USE_LIB32_PATHS`` global property analogous to the
``FIND_LIBRARY_USE_LIB64_PATHS`` property.  This helps find commands on
multilib systems that use ``lib32`` directories and either do not have
``lib`` symlinks or point ``lib`` to ``lib64``.
 2016-06-10 11:09:16 -04:00
Tobias Hunger
63c0e92c93 cmState: Expose list of properties of values in the cache 2016-06-10 09:33:41 -04:00
Tobias Hunger
6eee24634b cmCacheEntry: Retrieve all properties of cache entries 2016-06-10 09:33:41 -04:00
Tobias Hunger
120899c698 cmPropertyList: Add a way to retrieve all properties 2016-06-10 09:33:02 -04:00
Tobias Hunger
7066218e79 cmake: Kill cmake::CacheManager and its getter 
This member variable is never initialized and has apparently moved
to cmState.
 2016-06-10 09:27:59 -04:00
Tobias Hunger
f62ed322dc cmLocalGenerator: Add GetTargetDefines to get all defines for a target 2016-06-10 09:24:49 -04:00
Brad King
853b1bb4ba cmLocalGenerator: Constify AppendDefines and AddCompileDefinitions 2016-06-10 09:24:11 -04:00
Brad King
98aafb2ad6 Merge topic 'refactor-cmLocalGenerator-flags' 
d9613b96 cmLocalGenerator: Move GetFrameworkFlags implementation to private helper
70d3bf85 cmLocalGenerator: Adopt GetFrameworkFlags method
de4ee088 cmCommonTargetGenerator: De-duplicate CMAKE_BUILD_TYPE lookup
 2016-06-10 09:10:04 -04:00
Brad King
1bde72a390 Merge topic 'cmake-gui-osx-symlink-qt5-plugin' 
f2840155 cmake-gui: Teach Qt5 where plugins are when launched through a symlink
 2016-06-10 09:09:47 -04:00
Kitware Robot
1f9b35da10 CMake Nightly Date Stamp 2016-06-10 00:01:06 -04:00
Robert Maynard
f28401554a cmake-gui: Teach Qt5 where plugins are when launched through a symlink 
When we are on OSX and we are launching cmake-gui from a symlink, the
application will fail to launch as it can't find the qt.conf file which
tells it what the name of the plugin folder is. We need to add this path
BEFORE the application is constructed as that is what triggers the
searching for the platform plugins
 2016-06-09 13:21:27 -04:00
Tobias Hunger
d9613b962e cmLocalGenerator: Move GetFrameworkFlags implementation to private helper 2016-06-09 10:41:42 -04:00
Tobias Hunger
70d3bf8580 cmLocalGenerator: Adopt GetFrameworkFlags method 
Move it from cmCommonTargetGenerator.
 2016-06-09 10:39:57 -04:00
Brad King
8f3bd1f454 Merge topic 'ninja-no-ranlib-windows' 
ea598671 Run ranlib on archives only if the tool is available
 2016-06-09 09:18:28 -04:00
Brad King
c21397b2df Merge topic 'refactor-cmLocalGenerator-flags' 
b0d3e693 cmLocalGenerator: Pass configuration to GetTargetFlags
 2016-06-09 09:18:26 -04:00
Brad King
065bb0ffeb Merge topic 'small-cleanups' 
9f25fc4d Prefer std::ostream& over derivatives as parameters
f9cc43ea cmake: remove unnused member Verbose
6e658085 cmake: Fix constness of methods
87ffd76d cmake: Make internal method file static
fa169fe8 Parser: Merge identical conditions
 2016-06-09 09:18:23 -04:00
Brad King
01632c2552 Merge topic 'xmlwriter' 
e9da5192 CPack/PackageMaker: port to cmXMLWriter
 2016-06-09 09:18:21 -04:00
Daniel Pfeifer
e9da5192e5 CPack/PackageMaker: port to cmXMLWriter 2016-06-09 09:16:34 -04:00
Kitware Robot
3969994758 CMake Nightly Date Stamp 2016-06-09 00:01:07 -04:00
Daniel Pfeifer
9f25fc4dbb Prefer std::ostream& over derivatives as parameters 2016-06-08 23:08:40 +02:00
Daniel Pfeifer
f9cc43ea37 cmake: remove unnused member Verbose 2016-06-08 23:08:33 +02:00
Stephen Kelly
6e65808516 cmake: Fix constness of methods 2016-06-08 23:08:29 +02:00
Stephen Kelly
87ffd76d1a cmake: Make internal method file static 2016-06-08 23:08:24 +02:00
Stephen Kelly
fa169fe8a7 Parser: Merge identical conditions 2016-06-08 23:08:14 +02:00
Tobias Hunger
de4ee088e7 cmCommonTargetGenerator: De-duplicate CMAKE_BUILD_TYPE lookup 2016-06-08 16:41:41 -04:00
Tobias Hunger
b0d3e693f1 cmLocalGenerator: Pass configuration to GetTargetFlags 
Move the configuration lookup to call sites.  This will allow
multi-configuration callers to use the method.
 2016-06-08 16:18:31 -04:00
Brad King
8632251b25 Merge topic 'find_path-in-framework' 
188baef0 find_path: Fix location of <dir/header.h> in a framework on OS X
 2016-06-08 12:56:00 -04:00
Brad King
5572f5fffd Merge topic 'clang-format-again' 
ff08a80a Source/CPack: Run clang-format to fix style
3b284432 Tests/FindOpenCL: Run clang-format to fix style
 2016-06-08 12:55:58 -04:00
Brad King
ea59867187 Run ranlib on archives only if the tool is available 
CMakeFindBinUtils sets CMAKE_RANLIB to `:` if it is not available in
order to get a no-op.  This does not work on a Windows host build
environment that runs commands in `cmd` instead of `sh`.  Teach the
Ninja and Makefile generators to simply skip the command if it is `:`.

This this was already done by the Makefile generator since commit
v2.6.0~3161 (BUG: Do not write link script lines that use the ':',
2006-06-18), but only when using a link script.

Reported-by: Michael Jäntsch <Michael.Jaentsch@gmx.de>
 2016-06-08 12:00:44 -04:00
Kitware Robot
1cfc750150 CMake Nightly Date Stamp 2016-06-08 00:01:07 -04:00
Harry Mallon
188baef00c find_path: Fix location of <dir/header.h> in a framework on OS X 
After finding it in `foo.Framework/Headers/dir/header.h`, we should
report the `foo.Framework/Headers` directory, not
`foo.Framework/Headers/dir`, because the former is what actually
contains the path the caller wishes to include.
 2016-06-07 09:04:35 -04:00
Brad King
ff08a80af1 Source/CPack: Run clang-format to fix style 2016-06-07 08:41:16 -04:00
Brad King
633d99dc62 Merge topic 'remove-c_str' 
fa277b29 Remove c_str() calls from stream arguments.
ba5fb165 call static cmOutputConverter::GetFortranFormat without object
 2016-06-07 08:34:04 -04:00
Kitware Robot
14de21d7d2 CMake Nightly Date Stamp 2016-06-07 00:01:07 -04:00
Daniel Pfeifer
fa277b29e4 Remove c_str() calls from stream arguments. 
Mostly automated:

git grep -l '.c_str() <<' | xargs sed -i 's|\.c_str() <<| <<|g'
 2016-06-06 23:53:32 +02:00
Daniel Pfeifer
ba5fb16519 call static cmOutputConverter::GetFortranFormat without object 2016-06-06 23:32:38 +02:00
Brad King
d546456765 Merge topic 'productbuild' 
63e5eb5f Help: Add notes for 'productbuild' topic
2e3c67d1 productbuild: Add new productbuild cpack generator.
50a3d340 PackageMaker: factor out common code for creating pkg files.
 2016-06-06 11:19:20 -04:00
Kitware Robot
fc45ecfc50 CMake Nightly Date Stamp 2016-06-06 00:01:05 -04:00
Kitware Robot
1503a67bf4 CMake Nightly Date Stamp 2016-06-05 00:01:05 -04:00
Kitware Robot
6a22a7cf71 CMake Nightly Date Stamp 2016-06-04 00:01:05 -04:00
Clinton Stimpson
2e3c67d1b6 productbuild: Add new productbuild cpack generator. 
This cpack generator basically replaces the obsolete PackageMaker generator.
 2016-06-03 14:41:57 -06:00
Brad King
0663dbf133 Merge topic 'minor-cleanups' 
f6c21894 Modules: Rename internal platform-specific compiler determination modules
0c7951a9 cmLocalGenerator: Consolidate conditions in AddArchitectureFlags
 2016-06-03 10:45:59 -04:00
Brad King
9d16f64048 Merge topic 'fix-TARGET_PROPERTY-LOCATION-crash' 
f500a784 Fix crash on $<TARGET_PROPERTY:...,LOCATION> genex (#16134)
 2016-06-03 10:45:57 -04:00
Brad King
3d6638471a Merge topic 'size-empty' 
c6220de2 Use the empty() method to check for emptyness.
 2016-06-03 10:45:52 -04:00