summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-librhash' into import-librhashBrad King2016-11-0321-0/+3238
|\ | | | | | | | | * upstream-librhash: librhash 2016-11-01 (d839a1a8)
| * librhash 2016-11-01 (d839a1a8)librhash upstream2016-11-0321-0/+3238
| | | | | | | | Code extracted from: https://github.com/rhash/rhash.git at commit d839a1a853f22b8cfd26c2006ee5481739ea1114 (master).
* Add script to update librhash from upstreamBrad King2016-11-031-0/+43
|
* Merge branch 'release-3.6'Brad King2016-11-030-0/+0
|\
| * CMake 3.6.3v3.6.3Brad King2016-11-021-1/+1
| |
* | Merge branch 'release'Brad King2016-11-030-0/+0
|\ \
| * \ Merge branch 'FindHDF5-restore-default-C' into releaseBrad King2016-11-021-10/+2
| |\ \
* | \ \ Merge branch 'release-3.6'Brad King2016-11-030-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'FindHDF5-restore-default-C' into release-3.6Brad King2016-11-021-10/+2
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'qtdialog-lib-paths' into release-3.6Brad King2016-11-021-0/+2
| |\ \ \
* | \ \ \ Merge topic 'FindHDF5-restore-default-C'Brad King2016-11-031-10/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | ff3ccc1f FindHDF5: Restore pre-3.6 behavior of finding only C by default
| * | | | FindHDF5: Restore pre-3.6 behavior of finding only C by defaultBrad King2016-11-021-10/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.6.0-rc1~72^2 (HDF5: Rework component searching to correctly find HL for all bindings, 2016-05-12) changed the default behavior from finding only the C bindings to finding everything for the enabled languages. Restore the original behavior for compatibility and because many projects need only the C bindings. Closes: #16397
* | | | Merge topic 'remove-utf8-option'Brad King2016-11-038-63/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | baead1e2 Encoding: Remove option to use ANSI code page internally
| * | | | Encoding: Remove option to use ANSI code page internallyClinton Stimpson2016-11-028-63/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The switch to use UTF-8 encoding has been defaulted to on for quite some time since commit v3.2.0-rc1~116^2 (Encoding: Switch to use UTF-8 internally by default on Windows, 2014-12-26).
* | | | | Merge topic 'compile-features-for-language-standards'Brad King2016-11-0320-72/+120
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a8d758c Help: Document language standard meta-features df252db1 Features: Test cycle diagnostic with language standard meta-feature 6d5fb0e0 Features: Test feature propagation with language standard meta-feature a34b98a8 WCDH: Ignore language standard meta-features b0996a3f Features: Add meta-features requesting awareness of a particular standard 8b6cc251 Features: Centralize per-compiler recording macros 2d23f7b2 Features: Do not record features on MSVC < 2010
| * | | | | Help: Document language standard meta-featuresBrad King2016-11-022-0/+34
| | | | | |
| * | | | | Features: Test cycle diagnostic with language standard meta-featureBrad King2016-11-022-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `cxx_static_assert` feature may be available in C++ 98 mode of some compilers or not available at all in others. Intstead of using an individual feature to test cyclic requirement of a feature requiring C++ 11, use the `std_cxx_11` meta-feature that has exactly this meaning.
| * | | | | Features: Test feature propagation with language standard meta-featureBrad King2016-11-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `cxx_static_assert` feature may be available in C++ 98 mode of some compilers or not available at all in others. Intstead of using an individual feature to test propagation of a feature requiring C++ 11, use the `std_cxx_11` meta-feature that has exactly this meaning.
| * | | | | WCDH: Ignore language standard meta-featuresBrad King2016-11-021-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `{c,cxx}_std_*` features are meant for use with `target_compile_features` but do not make sense for use with WriteCompilerDetectionHeader. Filter them out of any requested list.
| * | | | | Features: Add meta-features requesting awareness of a particular standardBrad King2016-11-026-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A common use case of `target_compile_features` is simply to specify that the compiler should be run in a mode that is aware of e.g. C++11. Some projects simply specify a particular C++11-only feature to request this. Provide a first-class way to do this by naming features after the corresponding language standard. Record them as always available in the corresponding standard level so that requesting them always ensures that standard (or higher) is used.
| * | | | | Features: Centralize per-compiler recording macrosBrad King2016-11-0211-64/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify and de-duplicate per-compiler feature recording macros and convert to a centralized per-language macro.
| * | | | | Features: Do not record features on MSVC < 2010Brad King2016-11-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have no feature tests for versions of VS older than 2010, so do not even call `record_compiler_features` for such versions. This is consistent with other compilers where we call this macro only for versions for which we have recorded features.
* | | | | | Merge topic 'intel-compile-features-windows'Brad King2016-11-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b902f2a9 Features: Fix Intel cxx_attributes existence condition
| * | | | | | Features: Fix Intel cxx_attributes existence conditionBrad King2016-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This condition needs to follow the same pattern added in note `[1]` by commit a5a3642f (Features: Port Intel CXX features to test macros where possible, 2016-10-26). It was accidentally left out of that commit.
* | | | | | | CMake Nightly Date StampKitware Robot2016-11-031-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'release'Brad King2016-11-020-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'doc-cmake-qt-fixes' into releaseBrad King2016-11-021-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cpack-doc-typos' into releaseBrad King2016-11-022-7/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fix-macos-sysroot' into releaseBrad King2016-11-022-30/+2
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'doc-cmake-qt-fixes'Brad King2016-11-020-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c52e651 Help: Update example Qt 5 find_package call to add missing component 4c802a32 Help: Update example Qt 5 find_package call to use COMPONENTS
| * | | | | | | | Help: Update example Qt 5 find_package call to add missing componentThiago M. de C. Marques2016-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running CMake on it caused the following error: error: Target "publisher" links to target "Qt5::DBus" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? Add the missing DBus component.
| * | | | | | | | Help: Update example Qt 5 find_package call to use COMPONENTSMarcus D. Hanwell2016-11-021-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'doc-cmake-qt-missing-dbus'Brad King2016-11-021-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13bc31aa Help: Update example Qt 5 find_package call to add missing component
| * | | | | | | | | Help: Update example Qt 5 find_package call to add missing componentThiago M. de C. Marques2016-11-021-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running CMake on it caused the following error: error: Target "publisher" links to target "Qt5::DBus" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? Add the missing DBus component.
* | | | | | | | | Merge topic 'cpack-doc-typos'Brad King2016-11-022-4/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ab3b0c4 CPackRPM: Fix incorrect variable name in documentation e6460e7d CPackDeb: Fix incorrect variable name in documentation
| * | | | | | | | CPackRPM: Fix incorrect variable name in documentationAlex Turbov2016-11-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `CPACK_RPM_COMPONENT_INSTALL` is the correct variable to set to enable component packaging. `CPACK_RPM_PACKAGE_COMPONENT` is just set to a component name when CPack calls corresponding installer.
| * | | | | | | | CPackDeb: Fix incorrect variable name in documentationAlex Turbov2016-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `CPACK_DEB_COMPONENT_INSTALL` is the correct variable to set to enable component packaging. `CPACK_DEB_PACKAGE_COMPONENT` is just set to a component name when CPack calls corresponding installer.
* | | | | | | | | Merge topic 'fix_compiler_arg1'Brad King2016-11-021-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cfbf857b cmRulePlaceholderExpander: Fix CMAKE_<LANG>_COMPILER_ARG1 replacement
| * | | | | | | | | cmRulePlaceholderExpander: Fix CMAKE_<LANG>_COMPILER_ARG1 replacementZack Galbreath2016-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit b29425f7 (cmLocalGenerator: Populate a container of mappings for replacements, 2016-10-09) broke substitution of this placeholder by storing the wrong key in the new replacement map. Use the proper key, `CMAKE_<LANG>_COMPILER_ARG1`.
* | | | | | | | | | Merge topic 'fix-macos-sysroot'Brad King2016-11-022-30/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93504190 Darwin: Remove deployment target version check 542d52f9 Revert "Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path"
| * | | | | | | | | Darwin: Remove deployment target version checkGregor Jasny2016-11-012-26/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with Xcode 8 the SDK folder also contains an unversioned entry: MacOSX.sdk MacOSX10.12.sdk -> MacOSX.sdk If this unversioned path is used CMake cannot detect the SDK version. Furthermore, querying the SDK version via xcodebuild -sdk <sysroot> -version Path gives bogus results for the Command Line Tools installed into `/`. The OS X deployment target version and SDK version are not as tied as they once were, so this check is now more trouble than it is worth. Simply remove it. Closes: #16323
| * | | | | | | | | Revert "Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path"Gregor Jasny2016-11-011-4/+2
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.7.0-rc1~48^2 (Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path, 2016-09-25). The replacement of `else()` with `if(CMAKE_OSX_SYSROOT)` defeats the prior handling of `if("x${CMAKE_OSX_SYSROOT}" MATCHES "/")`. This causes the combination -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="" -DCMAKE_OSX_SYSROOT:STRING=/ to not be honored and `-isysroot` to be emitted as a compiler flag universally. We will need another solution to the problem the now-reverted commit was meant to address. Closes: #16394
* | | | | | | | | Merge topic 'UseSWIG-SWIG_OUTFILE_DIR'Brad King2016-11-022-3/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8444b984 UseSWIG: Add option to specify swig output file directory
| * | | | | | | | | UseSWIG: Add option to specify swig output file directoryCong Zhang2016-11-012-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `swig` has two output-related options: * `-o <outfile>`: Set name of C/C++ output file to <outfile> * `-outdir <dir>`: Set language-specific files output directory to <dir> We already have `CMAKE_SWIG_OUTDIR` for the latter. Add a new `SWIG_OUTFILE_DIR` option for the former.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-11-021-1/+1
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'find-qt5-docs'Brad King2016-11-011-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff11989c Help: Update example Qt 5 find_package call to use COMPONENTS
| * | | | | | | | | Help: Update example Qt 5 find_package call to use COMPONENTSMarcus D. Hanwell2016-11-011-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge topic 'doc-tweaks'Brad King2016-11-012-2/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 311d0376 Help: Document error behavior of file(REMOVE/REMOVE_RECURSE) 77e78af1 Help: Clarify how to run sequential commands in execute_process
| * | | | | | | | | Help: Document error behavior of file(REMOVE/REMOVE_RECURSE)Christian Fetzer2016-11-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarifies that there is no need to surround file(REMOVE/REMOVE_RECURSE) calls by `if(EXISTS)` as non existent files are silently ignored.
| * | | | | | | | | Help: Clarify how to run sequential commands in execute_processChristian Fetzer2016-11-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The execute_process command starts all commands in parallel (in order for the piping to work). Mention this explicitly and also add a note about how to execute commands sequentially.
generated by cgit v0.12 at 2024-11-14 19:30:52 (GMT)