Commit Graph

19026 Commits

Author SHA1 Message Date
Brad King ebf39cd306 Document behavior of multiple target_link_libraries calls (#13113)
State explicitly that multiple calls append (rather than replace).
2012-04-09 08:53:32 -04:00
KWSys Robot dcecea3953 KWSys Nightly Date Stamp 2012-04-09 00:05:08 -04:00
Peter Kuemmel c9747f34ce Ninja: CMAKE_USE_NINJA is the name of the macro 2012-04-08 14:45:05 +02:00
Peter Kuemmel 2a081a2b3a Ninja: no additional variable needed to enable ninja 2012-04-08 11:15:17 +02:00
KWSys Robot a00aa8ec8c KWSys Nightly Date Stamp 2012-04-08 00:05:09 -04:00
Peter Kuemmel b8c3e8c1f1 Ninja: enable Ninja for CodeBlocks 2012-04-07 21:54:57 +02:00
Peter Kuemmel 11bd9b5588 Ninja: remove GCC -Wshadow warning 2012-04-07 21:41:41 +02:00
Rolf Eike Beer 63d4960aef FindBoost: add support for 1.49 and 1.50
Boost 1.49 has already be released. Add this and the next to come version
number to the search list.
2012-04-07 10:21:02 +02:00
KWSys Robot bad16ab075 KWSys Nightly Date Stamp 2012-04-07 00:05:06 -04:00
Peter Kuemmel f93e81858b Ninja: add option to enable ninja where it is not enabled by default 2012-04-06 23:35:50 +02:00
Peter Kuemmel 73426ac774 Ninja: no 16:9 screens for the cmake team ;) 2012-04-06 21:07:32 +02:00
Peter Kuemmel 8217c26813 Ninja: ensure output directories exist 2012-04-06 19:31:18 +02:00
David Cole 6190415436 OS X: Mark find_program results as advanced
Avoid cluttering the gui with variables nearly nobody needs
to see.
2012-04-06 11:15:39 -04:00
David Cole d9edf46760 OS X: Use correct extra path when searching for applicaton bundles (#13066)
The parent commit added a search path relative to OSX_DEVELOPER_ROOT.
But with Xcode 4.3 the nested Applications folder is in a different
relative location compared to that root. This commit makes the intent
of the previous commit work with older and newer Xcode directory layouts.

Furthermore, it only adds paths that exist to the search path.
2012-04-06 11:14:37 -04:00
KWSys Robot 15f238fd6e KWSys Nightly Date Stamp 2012-04-06 00:05:06 -04:00
David Cole fcf265fe1a CPackNSIS: Rewrite variable documentation to make it more readable.
And avoid parsing problems at the first "."
2012-04-05 16:13:24 -04:00
David Cole d61d860dc3 CMake 2.8.8-rc2 2012-04-05 10:26:26 -04:00
David Cole 691df8dfd7 Merge branch 'release' 2012-04-05 10:23:51 -04:00
KWSys Robot 3f29f755c7 KWSys Nightly Date Stamp 2012-04-05 00:05:07 -04:00
KWSys Robot d19008cd54 KWSys Nightly Date Stamp 2012-04-04 00:05:06 -04:00
David Cole 5e9c7731e1 Merge topic 'fix-13082-use-config-0'
0579fa0 Xcode: Pay attention to custom configuration types (#13082)
2012-04-03 15:59:56 -04:00
David Cole 046f0f869e Merge topic 'ninja-generated-def'
3fd0dde Merge branch 'test-generated-def' into ninja-generated-def
d2c764a Ninja: Fix module .def file path conversion
2012-04-03 15:59:48 -04:00
David Cole c89264e275 Merge topic 'test-generated-def'
89987c2 Test generated module .def files
2012-04-03 15:59:37 -04:00
David Cole 3febff7958 Merge topic 'clarify-suffix-docs'
fa08375 CMake: Clarify SUFFIX target property documentation.
2012-04-03 15:59:28 -04:00
David Cole f1b48c14fb Merge topic 'OBJECTLibrariesInEclipse'
f93d03d fix #13054: support OBJECT libraries in Eclipse
2012-04-03 15:59:19 -04:00
David Cole 57e9f97b70 Merge topic 'doc-improvements'
32c3be6 FIND_LIBRARY: document FIND_LIBRARY_USE_LIB64_PATHS
edd8996 FILE: mention that TO_CMAKE_PATH also handles list delimiters
2012-04-03 15:59:10 -04:00
David Cole ff575b229d Merge topic 'dev/granular-test-targets-ninja'
d5318e0 Create granular targets for Ninja generators too
2012-04-03 15:59:02 -04:00
David Cole b450b6dcc7 Merge topic 'include-unistd-on-mac'
8a70495 automoc: include <unistd.h> on Apple to get pathconf
2012-04-03 15:58:53 -04:00
David Cole 7ecf76a19b Merge topic 'fix-source-classification'
01e979a VS: Add CMakeLists.txt re-run rules at start of generation
9a2c60e Classify known header file extensions as headers
1c48992 Always compile sources with known language
2012-04-03 15:58:42 -04:00
David Cole a6100082b9 Merge topic 'CPackPM-fixAmazonLinux'
3a0c60d Override topdir from rpm command line seems necessary on Amazon linux.
2012-04-03 15:58:33 -04:00
KWSys Robot 9ad3fa7e85 KWSys Nightly Date Stamp 2012-04-03 00:05:07 -04:00
David Cole 0579fa045c Xcode: Pay attention to custom configuration types (#13082)
Previously, we were setting the default configuration for a generated
Xcode project to the hard-coded string "Debug" even in cases where users
customized their configuration types such that the list did not contain
"Debug". Now, we use the first string listed in CMAKE_CONFIGURATION_TYPES
as the default config for generated Xcode projects.
2012-04-02 15:50:37 -04:00
Brad King 3fd0dde23e Merge branch 'test-generated-def' into ninja-generated-def 2012-04-02 11:00:42 -04:00
Brad King d2c764ad8d Ninja: Fix module .def file path conversion
Refactoring in commit a2514f15 (Simplify cmNinjaTargetGenerator using
cmGeneratorTarget, 2012-03-13) accidentally removed mapping of .def file
paths through ConvertToNinjaPath (via GetSourceFilePath).  Take the
ModuleDefinitionFile value from cmGeneratorTarget and map it correctly
through ConvertToNinjaPath.

In addition to generating cleaner paths in the ninja build files this
correctly links up references to a generated .def file with the custom
command output that produces it.
2012-04-02 10:58:56 -04:00
Brad King 89987c2102 Test generated module .def files
Teach the ModuleDefinition test to cover the case that a .def file is
generated by a custom command.
2012-04-02 10:54:25 -04:00
David Cole fa083753f1 CMake: Clarify SUFFIX target property documentation.
Make it clear that the property applies to libs, modules
and exes, not just libs.
2012-04-02 10:00:27 -04:00
KWSys Robot 0454057f8a KWSys Nightly Date Stamp 2012-04-02 00:05:06 -04:00
KWSys Robot 32daddf950 KWSys Nightly Date Stamp 2012-04-01 00:05:07 -04:00
Alex Neundorf d2ed3c7dee -fix #13081: support OBJECT libraries in CodeBlocks/QtCreator projects
Alex
2012-03-31 16:01:37 +02:00
KWSys Robot 41d1a73e5b KWSys Nightly Date Stamp 2012-03-31 00:05:07 -04:00
Alex Neundorf f93d03df43 fix #13054: support OBJECT libraries in Eclipse
Alex
2012-03-30 21:59:14 +02:00
KWSys Robot 7d99247454 KWSys Nightly Date Stamp 2012-03-30 00:05:06 -04:00
Rolf Eike Beer 32c3be611c FIND_LIBRARY: document FIND_LIBRARY_USE_LIB64_PATHS 2012-03-30 00:41:52 +02:00
Rolf Eike Beer edd8996fb4 FILE: mention that TO_CMAKE_PATH also handles list delimiters 2012-03-30 00:41:48 +02:00
Ben Boeckel d5318e00cb Create granular targets for Ninja generators too 2012-03-29 13:46:15 -04:00
KWSys Robot 43fa86b60f KWSys Nightly Date Stamp 2012-03-29 00:05:09 -04:00
Sean McBride 8a704955e1 automoc: include <unistd.h> on Apple to get pathconf 2012-03-28 15:07:00 -04:00
Brad King 01e979acef VS: Add CMakeLists.txt re-run rules at start of generation
Since commit 328c0f65 (Simplify cmVisualStudio10TargetGenerator source
classification, 2012-03-19) the VS 10 generator uses the
cmGeneratorTarget source classification instead of directly getting the
list of source files from the target.  This accidentally dropped the
CMakeLists.txt files from generated projects because they are added too
late for cmGeneratorTarget.

All generator-specific source files must be added to targets prior to
cmGeneratorTarget construction.  Refactor addition of the CMakeLists.txt
files with CMake re-run custom commands to take place before normal
generation begins, and therefore early enough to be included in the
cmGeneratorTarget classification.
2012-03-28 14:07:51 -04:00
Brad King 9a2c60eb83 Classify known header file extensions as headers
Commit 328c0f65 (Simplify cmVisualStudio10TargetGenerator source
classification, 2012-03-19) introduced the first use of source
classification from cmGeneratorTarget (which originated as Makefile
generator logic) in a Visual Studio generator for handling of header
files.  Fix classification of header files to match known header
extensions instead of only the HEADER_FILE_ONLY property.  Make it
consistent with the "Header Files" source group.
2012-03-28 08:59:14 -04:00
Brad King 1c489923d5 Always compile sources with known language
Refactoring by commit 11d9b211 (Add cmGeneratorTarget to represent a
target during generation, 2012-03-07) and commit 45c2f932 (Simplify
cmMakefileTargetGenerator using cmGeneratorTarget, 2012-03-07) preserved
behavior introduced by commit 7740ccd1 (some cleanup of the makefile
generator, 2006-02-14) that favored the IgnoreFile extension test over
the availability of a known compilation language associated with a
source file.  If a source is not marked as HEADER_FILE_ONLY and has a
known language extension or an explicit LANGUAGE property it should be
treated as that language.  The LANGUAGE source file property
documentation says so.
2012-03-28 08:58:38 -04:00