summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 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.
| * | | | | | Tests/Tutorial: Fix when USE_MYMATH is OFFDaniele E. Domenichelli2014-10-316-12/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unit tests for the square root of "-25" currently fail when USE_MYMATH is disabled. The "mysqrt" method in the tutorials, returns "0" for a negative value, while "sqrt" returns "NaN", and therefore the output is not accepted by the test. This patch checks if the number is negative and eventually returns "0" before calling "sqrt" or "mysqrt" to fix this issue. Printing a NaN might cause issues with the string catched by the tests on some platform. Therefore assume that "0" is correct and "fix" the USE_MYMATH=OFF version by checking if the number is negative and eventually returning "0" before calling "sqrt" or "mysqrt".
* | | | | | | Merge topic 'VERSION_no_sscanf'Brad King2014-10-312-19/+103
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef09df64 cmSystemTools: reimplement verson comparison without sscanf() 667560c8 extend the testing for version comparison
| * | | | | | | cmSystemTools: reimplement verson comparison without sscanf()Rolf Eike Beer2014-10-312-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This now has the advantage that it works with version strings with any number of components.
| * | | | | | | extend the testing for version comparisonRolf Eike Beer2014-10-291-6/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This now checks also the negative outcome of the comparision operation, and adds a bunch more different cases.
* | | | | | | | Merge topic 'CheckStructHasMember-avoid-breakage-on-Wall'Brad King2014-10-311-2/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d6ba358 CheckStructHasMember: Avoid clang -Wall breakage (#15203)
| * | | | | | | | CheckStructHasMember: Avoid clang -Wall breakage (#15203)Peter Wu2014-10-301-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With CMAKE_C_COMPILER=clang and CMAKE_C_FLAGS='-Wall -Werror', this test breaks with -Werror,-Wuninitialized. Fix this by getting rid of the temporary variable.
* | | | | | | | | Merge topic 'doc-add_library-typo'Brad King2014-10-311-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | 38825396 Documentation: Fix minor typo thecommand -> the command
| * | | | | | | | Documentation: Fix minor typo thecommand -> the commandNils Gladitz2014-10-311-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge topic 'xcode-inherit-warning-flags'Brad King2014-10-311-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 820e95d0 Xcode: Inherit global settings in per-target WARNING_CFLAGS (#15224)
| * | | | | | | | Xcode: Inherit global settings in per-target WARNING_CFLAGS (#15224)Brad King2014-10-311-0/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow projects to use CMAKE_CODE_ATTRIBUTE_WARNING_CFLAGS to add their own warning flags and have them used by the targets.
* | | | | | | | CMake Nightly Date StampKitware Robot2014-10-311-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'dev/alternate-generator-binaries'Brad King2014-10-301-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f04e0a2b ninja: Find alternate Ninja-compatible binaries
| * | | | | | | | ninja: Find alternate Ninja-compatible binariesBen Boeckel2014-10-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Red Hat distros, Ninja is /usr/bin/ninja-build because /usr/bin/ninja is an IRC bot.
* | | | | | | | | Merge topic 'doc-add_compile_options'Brad King2014-10-303-14/+17
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 352cbb6e Help: Reference add_compile_options from add_definitions (#15225) a9f8c50a Help: Clarify add_compile_options documentation (#15225)
| * | | | | | | | Help: Reference add_compile_options from add_definitions (#15225)Brad King2014-10-291-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we explain in add_definitions documentation that it is intended only for preprocessor definitions, link to add_compile_options for adding other flags. Also explicitly mention that the order of add_definitions calls with respect to target creation does not matter. This differs from the behavior now explicitly stated in the documentation of add_compile_options.
| * | | | | | | | Help: Clarify add_compile_options documentation (#15225)Brad King2014-10-292-10/+11
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain that it affects only targets added after the call. Fix the link to the COMPILE_OPTIONS directory propert documentation. Update the latter to explain that it is used to initialize the corresponding target property when a target is created.
* | | | | | | | Merge topic 'unix-icon-install'Brad King2014-10-302-3/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb13502f QtDialog: install the 128x128 icon fcb4541a QtDialog: don't install desktop file bits on Apple
| * | | | | | | | QtDialog: install the 128x128 iconBen Boeckel2014-10-292-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also only install the icons to the icons directory.
| * | | | | | | | QtDialog: don't install desktop file bits on AppleBen Boeckel2014-10-291-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Apple uses the dmg file which doesn't have .desktop support.
* | | | | | | | Merge topic 'doc-fix-html-favicon'Brad King2014-10-301-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca83c39c Utilities/Sphinx: Fix html_favicon configuration
| * | | | | | | | Utilities/Sphinx: Fix html_favicon configurationBrad King2014-10-291-1/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value must be either a full path or relative to the configuration directory, not relative to the 'static' directory. Use a full path. This avoids a warning: WARNING: favicon file 'cmake-favicon.ico' does not exist It worked before because all 'static' directory content is copied to the '_static' directory of html output anyway.
* | | | | | | | Merge topic 'wince-tests'Brad King2014-10-301-1/+52
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5bd29b88 Tests: Run Tutorial steps 1-4 as tests for Windows CE
| * | | | | | | | Tests: Run Tutorial steps 1-4 as tests for Windows CEPascal Bach2014-10-291-1/+52
| | | | | | | | |
* | | | | | | | | Merge topic 'cpack-bundle-codesign'Brad King2014-10-303-1/+152
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd3fbf36 CPack: Add support for code signing of bundles on MacOS
| * | | | | | | | | CPack: Add support for code signing of bundles on MacOSAndré Klitzing2014-10-283-1/+152
| | | | | | | | | |
* | | | | | | | | | Merge topic 'fix--D-command-line-parsing'Brad King2014-10-307-1/+16
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aee7e4a0 cmCacheManager: parse -D flags more strictly 368e8de4 Tests: test -D parsing on the command line
| * | | | | | | | | cmCacheManager: parse -D flags more strictlyBen Boeckel2014-10-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of: -DCACHE_VARS=-DEXTERNAL_PROJECT_CMAKE_ARG:BOOL=TRUE the variable is parsed out as: CACHE_VARS=-DEXTERNAL_PROJECT_CMAKE_ARG because the parser allows '=' in the variable name. Disallow such a name on the command line.
| * | | | | | | | | Tests: test -D parsing on the command lineBen Boeckel2014-10-206-0/+15
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2014-10-301-1/+1
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'ExternalProject-format-docs'Brad King2014-10-291-188/+277
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9c2c17b ExternalProject: Use explicit markup and definition lists in docs 98936ae3 ExternalProject: Convert docs to a bracket comment
| * | | | | | | | | ExternalProject: Use explicit markup and definition lists in docsBrad King2014-10-281-139/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert ExternalProject module documentation to use explicit markup blocks for each command. Enumerate command options with definition lists instead of a literal block. This will allow more detail to be added later. Also fix the logic that parses options out of the documentation to be aware of the new layout.