summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CPack allow RPM and DEB generator to be used on OSX.Eric NOULARD2012-05-205-42/+140
| | | | | | | | | More generally add the check for possible generator "activation" at runtime depending on a generator specific check. The dynamic behavior is currently implemented only for MacOS and should be fully backward compatible for other system. Inspired-By Tom Hughes <tomtheengineer@gmail.com>
* KWSys Nightly Date StampKWSys Robot2012-03-271-1/+1
|
* KWSys Nightly Date StampKWSys Robot2012-03-261-1/+1
|
* KWSys Nightly Date StampKWSys Robot2012-03-251-1/+1
|
* KWSys Nightly Date StampKWSys Robot2012-03-241-1/+1
|
* Merge topic 'fix-CTestUpdateHG-url'Brad King2012-03-231-1/+4
|\ | | | | | | | | d0702f8 CTest.UpdateHG: Fix repo URL for leading slash
| * CTest.UpdateHG: Fix repo URL for leading slashBrad King2012-03-221-1/+4
| | | | | | | | | | | | | | | | | | | | Use "file:///..." instead of "file:////..." when the file system path starts in a slash. Commit 0916cc88 (CTest.UpdateHG: Fix repo URL for local filesystem, 2012-03-02) added a third slash after "file://" unconditionally. This worked for many file systems but not on Cygwin where "file:////cygdrive/..." looks like "file://" followed by a network file path "//cygdrive/...". Add the slash only if the file system path does not already start with one.
* | KWSys Nightly Date StampKWSys Robot2012-03-231-1/+1
| |
* | KWSys Nightly Date StampKWSys Robot2012-03-221-1/+1
| |
* | Merge topic 'MinorFixForEcos'David Cole2012-03-211-1/+8
|\ \ | | | | | | | | | | | | 1ab4b3e guard eCos.cmake against multiple inclusion (#12987)
| * | guard eCos.cmake against multiple inclusion (#12987)Alex Neundorf2012-03-201-1/+8
| | | | | | | | | | | | Alex
* | | Merge topic 'UseRealPathWhenFindingEclipse'David Cole2012-03-211-1/+3
|\ \ \ | | | | | | | | | | | | | | | | 00af40b Eclipse: fix #13036, make version detection work with symlinks
| * | | Eclipse: fix #13036, make version detection work with symlinksAlex Neundorf2012-03-201-1/+3
| |/ / | | | | | | | | | | | | | | | | | | This patch uses get_filename_component(REALPATH) so symlinks in the path to Eclipse are resolved, which makes the version detection work in such cases. Alex
* | | Merge topic 'fix-AllFindModules-version-check'David Cole2012-03-211-3/+13
|\ \ \ | | | | | | | | | | | | | | | | a5ee628 Tests: Relax restrictions on version variable contents
| * | | Tests: Relax restrictions on version variable contentsDavid Cole2012-03-201-3/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our only expectation of version number variables should be that they begin with a decimal digit for VERSION_LESS, VERSION_EQUAL and VERSION_GREATER comparison purposes. If people put extra blah blah after a version number like "1.2.3 (this is some super special extra information about our funky proprietary build of the official 1.2.3 release)" then we should be ok with that. So: now we have the following expectations for version number variable content for the purposes of the AllFindModules test: - it should start with a decimal digit (match "^[0-9]") - it should not be empty - it should not be VERSION_EQUAL 0 - it should not be NOT VERSION_GREATER 0
* | | Merge topic 'update-KWIML'David Cole2012-03-211-6/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | 86c4c93 Merge branch 'upstream-kwiml' into update-KWIML 10272e6 KWIML: Avoid conflict with C++11 user-defined literals
| * \ \ Merge branch 'upstream-kwiml' into update-KWIMLBrad King2012-03-201-6/+6
| |\ \ \ | | |/ / | |/| |
| | * | KWIML: Avoid conflict with C++11 user-defined literalsBrad King2012-03-201-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang warns test/test_INT_format.h:28:26: warning: identifier after literal will be treated as a reserved user-defined literal suffix in C++11 [-Wc++11-compat-reserved-user-defined-literal] " expression [%"KWIML_INT_PRI##PRI"]," because the KWIML_... part is an identifier lexically immediately following a string literal. Add a space between the string literal and the identifier to avoid the C++11 user-defined literal syntax.
* | | | Merge topic 'findmpi_look_in_implicit_dirs'David Cole2012-03-211-0/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2f9ad7c Fix FindMPI for the intel compiler on linux by looking in implict directories.
| * | | | Fix FindMPI for the intel compiler on linux by looking in implict directories.Bill Hoffman2012-03-201-0/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Use the CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES to look for libraries that are in the -showme output from mpi<lang> programs. This is because some libraries reported by -showme are found there, and FindMPI will fail if they are not found.
* | | | Merge topic 'watcom-object-library'David Cole2012-03-214-12/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | fb7348f Fix ObjectLibrary test on Watcom
| * | | | Fix ObjectLibrary test on WatcomBrad King2012-03-204-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Watcom compiler interprets "-DB" as option -db generate browsing information so define "A_DEF" and "B_DEF" instead of just "A" and "B". Skip CMAKE_SHARED_LIBRARY_C_FLAGS for Watcom because it is set to -bd build Dynamic link library which adds a DLL entry point to each object.
* | | | | Merge topic 'vs10-object-items'David Cole2012-03-216-91/+65
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b291d9e VS10: Fix external objects generated outside target (#13047) 328c0f6 Simplify cmVisualStudio10TargetGenerator source classification
| * | | | | VS10: Fix external objects generated outside target (#13047)Brad King2012-03-203-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 9a6ff950 (Fix for bug where VS2010 did not use .obj files, 2011-04-01) assumed that if an external object is GENERATED that it is the output of a custom command in the current target. If it is generated by another target then VS will not automatically include the external object in the current target. This bug was preserved by the refactoring in the parent commit. Instead use <None> for external objects generated by a custom command in the current target and <Object> for all other external objects. Update the ExternalOBJ test to cover this case.
| * | | | | Simplify cmVisualStudio10TargetGenerator source classificationBrad King2012-03-194-91/+69
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Combine WriteCLSources and WriteObjSources into a single method. Use the cmGeneratorTarget source classification to simplify tool selection for each source file. Extend the classification to handle .idl files.
* | | | | Merge topic 'ImprovedCOMPONENTSSupportInFindPackage2'David Cole2012-03-2111-24/+186
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d100f9 find_package: Test rejection of required+optional components d81d83c add macro check_required_components() to configure_package_config_file() b15c0b4 FPHSA(): add HANDLE_COMPONENTS option 34108cd find_package: add documentation for OPTIONAL_COMPONENTS cdabde8 FPHSA(): add missing "]" to documentation f2e0a18 find_package: add OPTIONAL_COMPONENTS keyword
| * | | | | find_package: Test rejection of required+optional componentsBrad King2012-03-194-0/+11
| | | | | |
| * | | | | add macro check_required_components() to configure_package_config_file()Alex Neundorf2012-03-193-4/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed on cmake-developers, this patch adds a macro check_required_components() to the file configured via configure_package_config_file(), so for proper handling of components in Config.cmake files users can simply call check_required_components(PackageName) and this will do the right thing. Alex
| * | | | | FPHSA(): add HANDLE_COMPONENTS optionAlex Neundorf2012-03-193-2/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if the HANDLE_COMPONENTS is used, FPHSA() now also checks all required COMPONENTS, i.e. all elements from <name>_FIND_COMPONENTS for which <name>_FIND_REQUIRED_<comp> is true, and sets <name>_FOUND only to true if all have been found. As discussed on cmake-developers. Alex
| * | | | | find_package: add documentation for OPTIONAL_COMPONENTSAlex Neundorf2012-03-192-12/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds documentation for OPTIONAL_COMPONENTS to cmFindPackage.cxx, and also extends Modules/readme.txt significantly with regard to how components should be handled. Alex
| * | | | | FPHSA(): add missing "]" to documentationAlex Neundorf2012-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | find_package: add OPTIONAL_COMPONENTS keywordAlex Neundorf2012-03-191-5/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an OPTIONAL_COMPONENTS keyword to find_package() so we can have a clear distinction between required and optional components. Don't allow a component to be both required and optional. Alex
* | | | | | KWSys Nightly Date StampKWSys Robot2012-03-211-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'ninja-generator'David Cole2012-03-201-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c337c7e Ninja: Fix <OBJECT_DIR> substitution
| * | | | | Ninja: Fix <OBJECT_DIR> substitutionPeter Kuemmel2012-03-191-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Don't forget the subdirectories.
* | | | | | Merge topic 'object-library'David Cole2012-03-20121-477/+1701
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93d5509 Merge branch 'ninja-object-library' into object-library 821037c Merge branch 'xcode-object-library' into object-library eb24c99 Merge branch 'object-library' into xcode-object-library 63d1be8 Xcode: Honor $<TARGET_OBJECTS:...> source expressions 020ba38 Merge branch 'object-library' into xcode-object-library e8ea615 Build object library targets in Xcode 8045e17 Pre-compute object file names before Xcode generation 247a132 Allow txt files as ExtraSources in object library targets b063599 Add a default source group for object files. be01f3b Xcode: Re-factor some existing methods into "FromPath" variants 2693dbe Merge branch 'object-library' into ninja-object-library 51997cb Ninja: Honor $<TARGET_OBJECTS:...> source expressions 23ec258 Merge branch 'object-library' into ninja-object-library 61124de Build object library targets in Ninja f5b06cd Pre-compute object file names before Ninja generation a2514f1 Simplify cmNinjaTargetGenerator using cmGeneratorTarget ...
| * | | | | Merge branch 'ninja-object-library' into object-libraryBrad King2012-03-1923-7/+3160
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ninja-object-library: (37 commits) Ninja: Honor $<TARGET_OBJECTS:...> source expressions Build object library targets in Ninja Pre-compute object file names before Ninja generation Simplify cmNinjaTargetGenerator using cmGeneratorTarget Ninja: Avoid using 'this' in member initializers Ninja: Fix for PDB files with spaces in the path. Ninja: Constify use of cmCustomCommand Ninja: add /DEF: flag to linker call Ninja: Add a cache option CMAKE_ENABLE_NINJA to enable the ninja generator. Ninja: Add friend struct so it can access the private ConvertToNinjaPath. Ninja: add .def file support Ninja: ensure the output dir exists at compile time Ninja: Remove an unnecessary variable Ninja: Use cmSystemTools::ExpandListArgument to split compile/link commands Ninja: Add a missed license header Ninja: CMake: Adapt Ninja generator for per-target include dirs Ninja: windows msvc: create for each target a .pdb file Ninja: Import library support for Windows Ninja: mark the Windows specific hacks with a comment only Ninja: disable unfinished Windows ninja support ...
| | * \ \ \ \ Merge branch 'object-library' into ninja-object-libraryBrad King2012-03-1672-0/+360
| | |\ \ \ \ \
| | * | | | | | Ninja: Honor $<TARGET_OBJECTS:...> source expressionsBrad King2012-03-161-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add objects from object libraries referenced using this syntax to the set of objects linked in a target.
| | * | | | | | Merge branch 'object-library' into ninja-object-libraryBrad King2012-03-169-7/+278
| | |\ \ \ \ \ \
| | * | | | | | | Build object library targets in NinjaBrad King2012-03-164-7/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat OBJECT libraries as STATIC libraries but leave out the archive step. The object files will be left behind for reference by other targets later.
| | * | | | | | | Pre-compute object file names before Ninja generationBrad King2012-03-165-35/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement cmGlobalGenerator::ComputeTargetObjects in the Ninja generator to pre-compute all the object file names. Use the results during generation instead of re-computing it later.
| | * | | | | | | Simplify cmNinjaTargetGenerator using cmGeneratorTargetBrad King2012-03-162-43/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the classification of source files in this generator using that computed by cmGeneratorTarget.
| | * | | | | | | Merge branch 'object-library' into ninja-object-libraryBrad King2012-03-16310-2134/+3361
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge branch 'xcode-object-library' into object-libraryBrad King2012-03-194-66/+284
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * xcode-object-library: Xcode: Honor $<TARGET_OBJECTS:...> source expressions Build object library targets in Xcode Pre-compute object file names before Xcode generation Allow txt files as ExtraSources in object library targets Add a default source group for object files. Xcode: Re-factor some existing methods into "FromPath" variants Xcode: Re-factor code into GetObjectsNormalDirectory method
| | * | | | | | | | Merge branch 'object-library' into xcode-object-libraryBrad King2012-03-1972-0/+360
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Document OBJECT library type in add_library commandBrad King2012-03-161-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Describe the OBJECT library signature of add_library and the $<TARGET_OBJECTS:...> expressions needed to use object libraries. Also document the what is not allowed for object library targets.
| * | | | | | | | | Test OBJECT library use without other sourcesBrad King2012-03-165-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference OBJECT libraries for inclusion in targets that have no other sources to verify that the linker language propagates correctly from the object libraries. Test with a STATIC library, a SHARED library, and an EXECUTABLE target. Use the static and shared libraries each in executables that end up using the object library symbols. In VS 6, 7, and 7.1 add a dummy object file to convince the IDE to build the targets without sources. In Xcode add a dummy source file to convince it to build targets without sources.
| * | | | | | | | | Test OBJECT library language propagationBrad King2012-03-163-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the RunCMake.ObjectLibrary test to verify that languages used in an OBJECT library are propagated to targets that use it so that the languages can be included in link analysis.
| * | | | | | | | | Test OBJECT library failure casesBrad King2012-03-1651-0/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "RunCMake.ObjectLibrary" test to verify that unsupported use cases are rejected with errors: * An OBJECT library may not reference another object library * An OBJECT library may not be referenced in target_link_libraries * An OBJECT library may not contain non-compiling sources * An OBJECT library may not have pre/post build/link commands * An OBJECT library may not be installed, exported, or imported Also verify that invalid $<TARGET_OBJECTS:...> expressions are diagnosed.