summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'autogen_global_target'Brad King2018-11-1233-68/+638
|\ | | | | | | | | | | | | | | | | | | | | 0e97ef74d8 Autogen: Add release notes for CMAKE_GLOBAL_AUTOGEN/RCC_TARGET 2ef8fe2222 Autogen: Add documentation for CMAKE_GLOBAL_AUTOGEN/RCC_TARGET 8c8731b422 Autogen: Add test for CMAKE_GLOBAL_AUTOGEN/RCC_TARGET 3baa817c34 Autogen: Add support for global ``autogen`` and ``autorcc`` targets 3327d3bb20 Autogen: Add cmQtAutoGenGlobalInitializer class Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2567
| * Autogen: Add release notes for CMAKE_GLOBAL_AUTOGEN/RCC_TARGETSebastian Holtermann2018-11-111-0/+8
| |
| * Autogen: Add documentation for CMAKE_GLOBAL_AUTOGEN/RCC_TARGETSebastian Holtermann2018-11-119-0/+79
| |
| * Autogen: Add test for CMAKE_GLOBAL_AUTOGEN/RCC_TARGETSebastian Holtermann2018-11-1117-0/+279
| |
| * Autogen: Add support for global ``autogen`` and ``autorcc`` targetsSebastian Holtermann2018-11-114-16/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This teaches CMake the variables - CMAKE_GLOBAL_AUTOGEN_TARGET - CMAKE_GLOBAL_AUTOGEN_TARGET_NAME - CMAKE_GLOBAL_AUTORCC_TARGET - CMAKE_GLOBAL_AUTORCC_TARGET_NAME which control the generation of global ``autogen`` and ``autorcc`` targets. Closes #17721
| * Autogen: Add cmQtAutoGenGlobalInitializer classSebastian Holtermann2018-11-114-59/+115
| | | | | | | | | | This moves the global ``AUTOMOC/UIC/RCC`` targets initializer generation code into a separate new ``cmQtAutoGenGlobalInitializer`` class.
* | Merge topic 'FindODBC-mingw-avoid-hardcoded-odbc32'Brad King2018-11-121-1/+3
|\ \ | | | | | | | | | | | | | | | | | | 4e4551f9f3 FindODBC: Do not assume odbc32.lib for MinGW Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2585
| * | FindODBC: Do not assume odbc32.lib for MinGWMateusz Łoskot2018-11-091-1/+3
| | | | | | | | | | | | | | | | | | For MinGW, do not look for odbc32.lib but allow search for libodbc32.a. Fixes: #18539
* | | Merge topic 'FindICU-link-dl'Brad King2018-11-121-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1320122d3f FindICU: Add libdl to the link libraries for icu-uc Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Francois Budin <francois.budin@kitware.com> Merge-request: !2581
| * | | FindICU: Add libdl to the link libraries for icu-ucCameron Cawley2018-11-081-0/+4
| | | |
* | | | Merge branch 'release-3.13'Brad King2018-11-120-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'FindBoost-compiler-guess-update' into release-3.13Brad King2018-11-091-7/+26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2579
| * \ \ \ \ Merge branch 'asm-compiler-id-clang' into release-3.13Brad King2018-11-091-0/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2584
* | \ \ \ \ \ Merge topic 'asm-compiler-id-clang'Brad King2018-11-121-0/+8
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c84fb4812d ASM: Detect compiler id for Clang used as Assembler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2584
| * | | | | | ASM: Detect compiler id for Clang used as AssemblerBrad King2018-11-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing vendor table entries for Clang and AppleClang to identify them. Previously this worked only if Clang was also enabled as a C or CXX compiler first because we used to copy the C compiler id. However, that was removed by commit v3.13.0-rc1~44^2 (ASM: Search for full path even when using C or C++ compiler, 2018-09-26). Fixes: #18575
* | | | | | | Merge topic 'FindBoost-compiler-guess-update'Brad King2018-11-121-7/+26
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b71667a395 FindBoost: Improve compiler prefix detection for GCC 5+ and clang 4+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2579
| * | | | | | FindBoost: Improve compiler prefix detection for GCC 5+ and clang 4+Mateusz Łoskot2018-11-091-7/+26
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add recognition of compiler version and prefix for clang. Accommodate changes to version numbering scheme for GCC 5+ and clang 4+ - Minor number becomes patch, so excluded it from compiler prefix. - Improves searching for Boost 1.69+ libraries built with GCC 5+ and clang 4+, where library names are generated with compiler tag based on major version only eg. -gcc5 for GC 5.5.0 or -clang6 for clang 6.0.0 - Follows up related changes in upcoming Boost 1.69 https://github.com/boostorg/build/pull/349 Dump detected compiler version in Boost_DEBUG message. Replace use of CMAKE_COMPILER_IS_GNUCXX with CMAKE_CXX_COMPILER_ID.
* | | | | | CMake Nightly Date StampKitware Robot2018-11-121-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2018-11-111-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-11-101-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'release-3.13'Brad King2018-11-090-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'FindBoost-link-threads' into release-3.13Brad King2018-11-091-0/+3
| |\ \ \ | | |/ / | |/| | | | | | Merge-request: !2570
* | | | Merge topic 'FindBoost-link-threads'Brad King2018-11-091-0/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | bd831ed094 FindBoost: Add system thread library to Boost_LIBRARIES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2570
| * | | FindBoost: Add system thread library to Boost_LIBRARIESFelix Geyer2018-11-091-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Add the system thread library to Boost_LIBRARIES when the boost thread component has been found. The Boost::thread imported target already pulls in Threads::Threads. This changes does the same for projects using the Boost_LIBRARIES variable instead.
* | | Merge topic 'cpack-improve-unknown-generator-error'Brad King2018-11-092-3/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f29e2292c9 cpack: When given an unknown generator print out all valid generators eba7273c20 cpack: Better error message when generator doesn't exist. Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: David Cole <dlrdave@aol.com> Merge-request: !2580
| * | | cpack: When given an unknown generator print out all valid generatorsRobert Maynard2018-11-091-1/+14
| | | | | | | | | | | | | | | | This makes cpack behavior match cmake when passed an invalid generator
| * | | cpack: Better error message when generator doesn't exist.Robert Maynard2018-11-082-3/+4
| | |/ | |/| | | | | | | | | | | | | Currently the CPack error message when passed an invalid generator name reads like the generator failed to work, rather than the name was invalid.
* | | Merge topic 'env'Brad King2018-11-098-23/+104
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 860338491e Help: Describe $CACHE and $ENV as operators e855bd5248 Help: Document if(DEFINED ENV{name}) 8ba2a8d4a4 Help: short/long variable reference in if command 85498fccd8 Help: Provide backreferences. e24ef96942 Help: New section on Environment Variables in cmake-language.7 e4554149c4 Help: Remove over-precise clause. 3de551cc22 Help: Clarify effect of set(ENV{..} ..) and unset(ENV{..}) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2538
| * | | Help: Describe $CACHE and $ENV as operatorsJoachim Wuttke (l)2018-11-083-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | This resolves issue #18514 Also add a cross-reference to if(DEFINED ENV{var}).
| * | | Help: Document if(DEFINED ENV{name})Joachim Wuttke (h)2018-11-081-7/+9
| | | |
| * | | Help: short/long variable reference in if commandJoachim Wuttke (l)2018-11-082-4/+14
| | | | | | | | | | | | | | | | | | | | Explain that the short form of variable references in the if command does not apply to ENV and CACHE vars.
| * | | Help: Provide backreferences.Joachim Wuttke (h)2018-11-083-2/+19
| | | | | | | | | | | | | | | | | | | | Short intro to pages cmake-variables.7 and cmake-env-variables.7, with backlinks to cmake-language.7.
| * | | Help: New section on Environment Variables in cmake-language.7Joachim Wuttke (h)2018-11-081-1/+28
| | | |
| * | | Help: Remove over-precise clause.Joachim Wuttke (h)2018-11-081-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Section "Variables References" said that environment and cache variables are "evaluated in the same contexts as a normal variable reference". The reader has to guess what "contexts" means in this context. Probably "inside a Quoted Argument or an Unquoted Argument", exactly as for ordinary variable references. But this is exactly what the reader would tacitly assume anyway. Therefore I think the removed clause was unnecessary, and possibly more confusing than helpful.
| * | | Help: Clarify effect of set(ENV{..} ..) and unset(ENV{..})Joachim Wuttke (h)2018-11-082-5/+20
| |/ / | | | | | | | | | | | | | | | | | | Explain that the commands affect only the current CMake process, not the process from which CMake was called, nor the system environment at large, nor the environment of subsequent build or test processes.
* | | CMake Nightly Date StampKitware Robot2018-11-091-1/+1
|/ /
* | Merge topic 'install-defaults'Brad King2018-11-0838-83/+953
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | fdcd559a8e Help: Add documentation and release notes for install 9fc20a4f3e install: Add sane set of defaults for DESTINATION and file type parameters Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Acked-by: Ruslan Baratov <ruslan_baratov@yahoo.com> Merge-request: !2558
| * | Help: Add documentation and release notes for installKyle Edwards2018-11-072-4/+121
| | | | | | | | | | | | | | | This change adds documentation for the new DESTINATION behavior of the install() command.
| * | install: Add sane set of defaults for DESTINATION and file type parametersKyle Edwards2018-11-0736-79/+832
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user does not specify a DESTINATION for a target type, the install() command checks to see if the appropriate variable from GNUInstallDirs is set. If it is not, then it uses an appropriate hard-coded guess. In addition, for FILES and DIRECTORY, the user can specify a file type instead of a DESTINATION, and the command will use the appropriate variable from GNUInstallDirs, or a hard-coded guess if it is not set.
* | | Merge topic 'pkgconfig-mark-advanced'Brad King2018-11-081-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5c46dd84e PkgConfig: Be less verbose by mark(ing)_as_advanced the find_library result Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Rolf Eike Beer <eike@sf-mail.de> Merge-request: !2576
| * | | PkgConfig: Be less verbose by mark(ing)_as_advanced the find_library resultSylvain Joubert2018-11-071-0/+1
| | | |
* | | | Merge topic 'find-jpeg-turbo-multiarch-version'Brad King2018-11-083-17/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c4c4be509 FindJPEG: handle multiarch installs of libjpeg-turbo Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2572
| * | | | FindJPEG: handle multiarch installs of libjpeg-turboBen Boeckel2018-11-063-17/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fedora installs a `jconfig-32.h` and `jconfig-64.h` which were not searched. Instead, glob up all `jconfig` headers and bail once we've found a version number.
* | | | | CMake Nightly Date StampKitware Robot2018-11-081-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'release-3.13'Brad King2018-11-070-0/+0
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | CMake 3.13.0-rc3v3.13.0-rc3Brad King2018-11-071-1/+1
| | |
* | | Merge branch 'release-3.13'Brad King2018-11-070-0/+0
|\ \ \ | |/ /
| * | Merge branch 'FindOpenMP-log-errors' into release-3.13Brad King2018-11-071-3/+10
| |\ \ | | | | | | | | | | | | Merge-request: !2574
* | \ \ Merge topic 'FindOpenMP-log-errors'Brad King2018-11-071-3/+10
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 272c4c3dee FindOpenMP: Log error output db0445f0c8 FindOpenMP: Fix warnings with -Wstrict-prototypes Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Christian Pfeiffer <cpfeiffer@live.de> Merge-request: !2574
| * | | FindOpenMP: Log error outputIvan Pozdeev2018-11-071-1/+8
| | | |