summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Makefile: Refactor checks for lang-specific targets and export compile cmdsTim Gallagher2014-11-052-22/+34
| | | | | | The checks are now split into languages that are able to generate assembly listings, languages that are able to generate preprocessed listings, and languages that are able to export the compile commands.
* CMake Nightly Date StampKitware Robot2014-11-051-1/+1
|
* Merge branch 'release'Brad King2014-11-040-0/+0
|\
| * Merge branch 'FindIce-no-envvar-markup' into releaseBrad King2014-11-031-1/+1
| |\
| * \ Merge branch 'watcom-drop-symfile-option' into releaseBrad King2014-11-031-2/+2
| |\ \
* | \ \ Merge topic 'ExternalProject_independent-step-targets'Brad King2014-11-048-16/+211
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 468fb734 Help: Add notes for topic 'ExternalProject_independent-step-targets' 67cfbf8e ExternalProject: Add unit tests f598f1aa ExternalProject: Add ExternalProject_Add_StepDependencies function 4ae133e0 ExternalProject: Add independent step targets
| * | | | Help: Add notes for topic 'ExternalProject_independent-step-targets'Brad King2014-11-041-0/+6
| | | | |
| * | | | ExternalProject: Add unit testsDaniele E. Domenichelli2014-11-036-1/+89
| | | | |
| * | | | ExternalProject: Add ExternalProject_Add_StepDependencies functionDaniele E. Domenichelli2014-11-031-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ExternalProject_Add_StepDependencies function add some dependencies for some external project step. The syntax is: ExternalProject_Add_Step_Dependencies(<name> <step> [target1 [target2 [...]]]) This function takes care to set both target and file level dependencies, and will ensure that parallel builds will not break. It should be used instead of add_dependencies() when adding a dependency for some of the step targets generated by ExternalProject. See also: http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/8680/focus=8926
| * | | | ExternalProject: Add independent step targetsDaniele E. Domenichelli2014-11-031-15/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adding step targets using ExternalProject_Add_StepTargets, the STEP_TARGETS argument or the EP_STEP_TARGETS property, ExternalProject sets all the dependencies for the main project to that target. Due to this, the update target cannot be used without downloading and building all the dependencies. In order to be able to add step targets that do not depend on other external projects, this patch adds: * An optional "NO_DEPENDS" argument to the ExternalProject_Add_StepTargets function. If this argument is set, then no dependencies are set for the target (file dependencies will still be set). * A new argument INDEPENDENT_STEP_TARGETS to the ExternalProject_Add function and a new directory property EP_INDEPENDENT_STEP_TARGETS that behave like STEP_TARGETS and EP_STEP_TARGETS, but cause the ExternalProject_Add_StepTargets to be called with the NO_DEPENDS argument.
* | | | | Merge topic 'fix-missing-SIZE_MAX'Brad King2014-11-043-5/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 996f8229 liblzma: fix build on platforms with no SIZE_MAX defined.
| * | | | | liblzma: fix build on platforms with no SIZE_MAX defined.Chuck Atkins2014-11-033-5/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some systems don't define a SIZE_MAX (older versions of HP-UX with aCC). The logic was already in place to account for this condition but SIZEOF_SIZE_T was not getting cmoputed at configure time to allow it to function. This computes sizeof(size_t) at configure time to allow the appropriate logic to work. It also changes SIZEOF_SIZE_T to SIZE_OF_SIZE_T for consistency.
* | | | | Merge topic 'FindIce-no-envvar-markup'Brad King2014-11-041-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | 01fb3190 FindIce: Drop use of :envvar: Sphinx markup
| * | | | FindIce: Drop use of :envvar: Sphinx markupBrad King2014-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | We do not use it elsewhere yet, and do not want to index environment variables inconsistently.
* | | | | Merge topic 'extra-generators-std-flags'Brad King2014-11-041-1/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eaf6f67f Code Blocks/Eclipse: Add -std= flag matching. 45a25d63 Code Blocks/Eclipse: Use non-default stdlib includes when specified.
| * | | | | Code Blocks/Eclipse: Add -std= flag matching.Christian Manning2014-11-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | When -std=x is specified in CMAKE_CXX_FLAGS this passes it along.
| * | | | | Code Blocks/Eclipse: Use non-default stdlib includes when specified.Christian Manning2014-11-031-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When -stdlib=x is specified in CMAKE_CXX_FLAGS this passes it along so that the correct include dirs are detected.
* | | | | | Merge topic 'watcom-drop-symfile-option'Brad King2014-11-041-2/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | 6b63942e Watcom: Drop symfile linker option
| * | | | | Watcom: Drop symfile linker optionJ Decker2014-11-031-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup of Windows-wcl386.cmake in commit v3.1.0-rc1~693^2 (Watcom: Cleanup Windows-wcl386 configuration, 2014-04-01) also introduced use of the 'symfile' link option but did not mention it in the commit message. There is no way to set the symbol file name of a target, so it is better to revert that change. It is easy to run 'wstrip *' if the symbols need to be stripped, but it is very difficult to get the right names for the .sym files to install with debug/rel_with_deb_info configurations.
* | | | | Merge topic 'update-kwsys'Brad King2014-11-049-134/+249
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5868b4e2 Merge branch 'upstream-kwsys' into update-kwsys 72b5b480 KWSys 2014-10-31 (88c8cc7f)
| * \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-10-319-135/+250
| |\ \ \ \ \
| | * | | | | KWSys 2014-10-31 (88c8cc7f)KWSys Robot2014-10-319-135/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 88c8cc7f | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 29ffaf43..88c8cc7f Ben Boeckel (11): 9bf03363 Avoid if() quoted auto-dereference 771e0f22 DynamicLoader: use strings for arguments 86e20d68 Directory: remove extra define 6cc24510 SystemTools: use strings in environment functions bab5b1f2 SystemTools: add string overload for ReplaceString f3fb01cf SystemTools: use strings for path-related APIs 0dfbe56d SystemTools: use strings for making C identifiers 4690fc8d SystemTools: use strings in registry function 1b762a41 SystemTools: search for characters 4a060347 SystemInformation: use %ls for WCHAR* format specifiers d31f7b12 SystemTools: remove unused variable Brad King (1): 88c8cc7f Fix configure_file call to use COPYONLY, not COPY_ONLY Clinton Stimpson (1): 5bf91dda SystemTools: Use extended length path for copying files. Change-Id: I16e8e55dea1c171c04f9c7d04ae3c575531097c3
* | | | | | | Merge topic 'ctest-delphi-coverage'Brad King2014-11-041-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df720de2 Help: Add notes for topic 'ctest-delphi-coverage'
| * | | | | | | Help: Add notes for topic 'ctest-delphi-coverage'Brad King2014-11-041-0/+4
| | | | | | | |
* | | | | | | | Merge topic 'cpack-rpm-component-descriptions'Brad King2014-11-041-0/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cfb3a869 Help: Add notes for topic 'cpack-rpm-component-descriptions'
| * | | | | | | | Help: Add notes for topic 'cpack-rpm-component-descriptions'Brad King2014-11-041-0/+7
| | | | | | | | |
* | | | | | | | | Merge topic 'cpack-rpm-pre-post-install'Brad King2014-11-041-0/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e927faf Help: Add notes for topic 'cpack-rpm-pre-post-install'
| * | | | | | | | | Help: Add notes for topic 'cpack-rpm-pre-post-install'Brad King2014-11-041-0/+12
| | | | | | | | | |
* | | | | | | | | | Merge topic 'add_javascript_coverage_parser'Brad King2014-11-041-0/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c236b160 Help: Add notes for topic 'add_javascript_coverage_parser'
| * | | | | | | | | | Help: Add notes for topic 'add_javascript_coverage_parser'Brad King2014-11-041-0/+4
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'ExternalProject_CMAKE_CACHE_DEFAULT_ARGS'Brad King2014-11-041-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56f4949c Help: Add notes for topic 'ExternalProject_CMAKE_CACHE_DEFAULT_ARGS'
| * | | | | | | | | | | Help: Add notes for topic 'ExternalProject_CMAKE_CACHE_DEFAULT_ARGS'Brad King2014-11-041-0/+6
| | | | | | | | | | | |
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2014-11-041-1/+1
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'release'Brad King2014-11-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch 'fix-configure_file-COPYONLY' into releaseBrad King2014-11-033-3/+3
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge topic 'fix-configure_file-COPYONLY'Brad King2014-11-037-3/+29
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1531df2b configure_file: Warn about unknown arguments 4abbb140 Qt4: Fix configure_file call to use COPYONLY, not COPY_ONLY bd7ba8e2 KWSys: Fix configure_file call to use COPYONLY, not COPY_ONLY e9282782 Help: Fix configure_file call to use COPYONLY, not COPY_ONLY
| * | | | | | | | | | | configure_file: Warn about unknown argumentsBrad King2014-10-314-0/+26
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the RunCMake.configure_file test with a case covering possible common typos of the COPYONLY option. Reported-by: Iosif Neitzke <iosif.neitzke@gmail.com>
| * | | | | | | | | | Qt4: Fix configure_file call to use COPYONLY, not COPY_ONLYBrad King2014-10-311-1/+1
| | | | | | | | | | |
| * | | | | | | | | | KWSys: Fix configure_file call to use COPYONLY, not COPY_ONLYBrad King2014-10-311-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Help: Fix configure_file call to use COPYONLY, not COPY_ONLYIosif Neitzke2014-10-311-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The configure_file signature has option 'COPYONLY' (no underscore). Fix the example in 'cmake-packages.7.rst'.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2014-11-031-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2014-11-021-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2014-11-011-1/+1
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Merge branch 'release'Brad King2014-10-310-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'doc-add_library-typo' into releaseBrad King2014-10-311-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'doc-add_compile_options' into releaseBrad King2014-10-293-14/+17
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'FindCurses-include-CheckLibraryExists' into releaseBrad King2014-10-291-1/+2
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'ExternalProject_CMAKE_CACHE_DEFAULT_ARGS'Brad King2014-10-3114-21/+162
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 609037f4 ExternalProject: Add unit tests for CMAKE_CACHE_DEFAULT_ARGS 98cdb658 ExternalProject: Add CMAKE_CACHE_DEFAULT_ARGS arguments 36cf8a1e Tests/Tutorial: Fix when USE_MYMATH is OFF
| * | | | | | | | | | | ExternalProject: Add unit tests for CMAKE_CACHE_DEFAULT_ARGSDaniele E. Domenichelli2014-10-316-0/+80
| | | | | | | | | | | |
| * | | | | | | | | | | ExternalProject: Add CMAKE_CACHE_DEFAULT_ARGS argumentsDaniele E. Domenichelli2014-10-312-9/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This argument allows to set default arguments that are written in the initial cache file, but that are not forced, and therefore allows the user to change these values later (CMAKE_ARGS and CMAKE_CACHE_ARGS always overwrite the values). Also add some documentation to explain the differences between these 3 arguments. Extend ExternalProjectLocal test to cover CMAKE_CACHE_DEFAULT_ARGS.