summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'osx-no-deployment-target-on-cross-compile' into releaseBrad King2016-10-171-1/+1
|\
| * OS X: Do not try to set deployment target when cross-compilingGregor Jasny2016-10-171-1/+1
| | | | | | | | | | | | | | | | | | The change in commit v3.4.0-rc2~6^2 (Xcode: Adjust deployment target SDK version to host version, 2015-10-11) does not make sense when cross-compiling. Make it conditional to fix this regression in some cross-compiling cases. Closes: #16355
* | Merge branch 'ice-3.6.3' into releaseBrad King2016-10-131-0/+1
|\ \
| * | FindIce: Add support for version 3.6.3Roger Leigh2016-10-131-0/+1
| |/
* | Merge branch 'ExternalProject-fix-CMAKE_CACHE_ARGS-list' into releaseBrad King2016-10-101-1/+1
|\ \
| * | ExternalProject: Fix regression in passing list to CMAKE_CACHE_ARGSMax Smolens2016-10-101-1/+1
| |/ | | | | | | | | | | | | | | | | | | Fix passing a list to the CMAKE_CACHE_ARGS and CMAKE_CACHE_DEFAULT_ARGS options of ExternalProject_Add. Following commit v3.7.0-rc1~273^2~1 (prefer list(APPEND) over string(APPEND) where appropriate, 2016-08-08), the semicolon list separator after the first list element was missing in the generated cache.
* | Merge branch 'FindProtobuf-fix-subdirs' into releaseBrad King2016-10-071-6/+10
|\ \
| * | FindProtobuf: Fix protobuf_generate_*() to handle subdirsMartin Joly2016-10-071-6/+10
| |/ | | | | | | | | | | | | | | | | | | The change in commit v3.7.0-rc1~513^2 (FindProtobuf: fix protobuf_generate_*() to handle proto files in subdirs, 2016-06-09) incorrectly adds subdirectories to the path of the generated files when `*.proto` files are passed to `protobuf_generate_*` with subdirectories. This behavior is not correct when `PROTOBUF_GENERATE_CPP_APPEND_PATH` is True (default behavior) as `protoc` will generate output file in the current build directory.
* | Merge branch 'android-cxxabi' into releaseBrad King2016-10-071-0/+2
|\ \
| * | Android: Fix support for cxxabi.h with libc++Brad King2016-10-071-0/+2
| | | | | | | | | | | | | | | | | | Additional include directories are needed for this on some STL types. Closes: #16350
* | | Merge branch 'android-ndk-r13' into releaseBrad King2016-10-061-1/+7
|\ \ \ | |/ /
| * | Android: Update libc++ include directories for NDK r13Brad King2016-10-061-1/+7
| |/ | | | | | | | | | | The Android NDK r13 moved the libc++ include directories. Closes: #16346
* | Merge branch 'cpack-rpm-debuginfo-fixes' into releaseBrad King2016-10-061-28/+40
|\ \
| * | CPack/RPM debuginfo package without binariesDomen Vrankar2016-10-061-27/+38
| | | | | | | | | | | | | | | Handle case when a component doesn't contain any debuginfo symbols.
| * | CPack/RPM debuginfo package objdump error suppressionDomen Vrankar2016-10-061-1/+2
| |/ | | | | | | | | | | | | objdump prints out error text if file is not an executable and that should be suppressed as we don't care about non executable files during that test
* | Merge branch 'FindMatlab-fix-simulink-cache' into releaseBrad King2016-10-051-0/+1
|\ \
| * | FindMatlab: remove SIMULINK path from cache when FindMatlab is reconfiguredRaffi Enficiaud2016-10-051-0/+1
| |/
* | FindMatlab: small documentation fixesRaffi Enficiaud2016-10-051-8/+7
|/
* FindBoost: Add 1.62 and 1.62.0 as supported versionsRoger Leigh2016-10-031-1/+1
|
* Merge topic 'add-setup-projects-tests-module'Brad King2016-10-012-0/+331
|\ | | | | | | | | 130784e0 AndroidTestUtilities: Add module to help drive Android device tests
| * AndroidTestUtilities: Add module to help drive Android device testsSchuyler Kylstra2016-09-302-0/+331
| | | | | | | | | | | | Add a module to manage the data needed for the project tests. It will move the test data to the build directory and transfer necessary data to an Android device if that is enabled.
* | Merge topic 'FindCxxTest-no-unix-interp'Brad King2016-09-291-2/+9
|\ \ | | | | | | | | | | | | 32ee69c5 FindCxxTest: Do not run cxxtestgen through interpreter unless necessary
| * | FindCxxTest: Do not run cxxtestgen through interpreter unless necessaryBrad King2016-09-281-2/+9
| |/ | | | | | | | | | | | | | | | | | | On platforms that support shebang lines the `cxxtestgen` script should be able to execute without an explicit interpreter. Do this if possible so that the proper interpreter specified by the shebang line is honored. Ideally we shouldn't even need to find `python` in this case, but that will be a larger change better made by a dedicated module maintainer. Closes: #16331
* | Merge topic 'vs-clang-llvm-support'Brad King2016-09-291-2/+2
|\ \ | |/ |/| | | | | 3f300b84 VS: Recognize VS/LLVM toolset names as Clang
| * VS: Recognize VS/LLVM toolset names as ClangRoman Wüger2016-09-281-2/+2
| | | | | | | | | | | | Update the toolset name matching added by commit v3.6.0-rc1~279^2~10 (VS: in Clang/C2 toolset, setup correct compiler settings, 2016-02-18) to match VS/LLVM toolset names too.
* | Merge topic 'simplify-license-notices'Brad King2016-09-28391-5102/+1019
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19671831 Help: Update cmake-developer(7) module license docs for new notice 756169ac Tests: Update ModuleNotices test for new notice 845d86bc Utilities/Scripts: Remove temporary script that filtered license notices 86578ecc Simplify CMake per-source license notices b7180cfe Utilities/Scripts: Add temporary script to filter license notices 7feb4ecc Copyright.txt: Add notice of copyright by contributors 78f77f60 Utilities/KWStyle: Remove unused header check reference file 681e0429 Tests: Fix RunCMake.CTest output match to tolerate line number changes
| * | Simplify CMake per-source license noticesBrad King2016-09-27391-5102/+1019
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per-source copyright/license notice headers that spell out copyright holder names and years are hard to maintain and often out-of-date or plain wrong. Precise contributor information is already maintained automatically by the version control tool. Ultimately it is the receiver of a file who is responsible for determining its licensing status, and per-source notices are merely a convenience. Therefore it is simpler and more accurate for each source to have a generic notice of the license name and references to more detailed information on copyright holders and full license terms. Our `Copyright.txt` file now contains a list of Contributors whose names appeared source-level copyright notices. It also references version control history for more precise information. Therefore we no longer need to spell out the list of Contributors in each source file notice. Replace CMake per-source copyright/license notice headers with a short description of the license and links to `Copyright.txt` and online information available from "https://cmake.org/licensing". The online URL also handles cases of modules being copied out of our source into other projects, so we can drop our notices about replacing links with full license text. Run the `Utilities/Scripts/filter-notices.bash` script to perform the majority of the replacements mechanically. Manually fix up shebang lines and trailing newlines in a few files. Manually update the notices in a few files that the script does not handle.
* | Merge topic 'GNUInstallDirs-more-BSD'Brad King2016-09-281-1/+1
|\ \ | | | | | | | | | | | | 956054ae GNUInstallDirs: All *BSDs use ${PREFIX}/{man,info} for man and info pages
| * | GNUInstallDirs: All *BSDs use ${PREFIX}/{man,info} for man and info pagesDmitry Marakasov2016-09-271-1/+1
| | |
* | | Merge topic 'findjni'Brad King2016-09-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 59eb75d9 FindJNI: Add aarch32 path on arm
| * | | FindJNI: Add aarch32 path on armOrion Poplawski2016-09-271-1/+1
| |/ /
* | | Merge topic 'silent-nsis-installs'Brad King2016-09-281-2/+2
|\ \ \ | |_|/ |/| | | | | | | | cb8db285 CPack/NSIS: Fix silent NSIS installs
| * | CPack/NSIS: Fix silent NSIS installsCraig Scott2016-09-271-2/+2
| |/ | | | | | | | | | | | | | | | | | | The installer should not put up a message box to confirm uninstall of a previous version for silent installs. Furthermore, when the uninstaller is invoked, do not show its confirmation dialog because either (a) the installer already asked the user or (b) the installer is running in silent mode. Closes: #16328
* | Merge topic 'cpack-rpm-debuginfo-sources'Brad King2016-09-272-20/+243
|\ \ | | | | | | | | | | | | | | | | | | 39c7d62c CPack/RPM debuginfo packaging documentation dd3c938a CPack/RPM debuginfo directories to sources b78fcf0d CPack/RPM debuginfo packages must contain sources
| * | CPack/RPM debuginfo packaging documentationDomen Vrankar2016-09-271-8/+90
| | |
| * | CPack/RPM debuginfo directories to sourcesDomen Vrankar2016-09-271-2/+30
| | | | | | | | | | | | | | | | | | List of sources must be split into paths parts so that debuginfo package cleans up after itself.
| * | CPack/RPM debuginfo packages must contain sourcesDomen Vrankar2016-09-272-12/+125
| | | | | | | | | | | | | | | Issue #15668 fix was missing relevant source files in debuginfo package.
* | | Merge topic 'find-matlab-pthread'Brad King2016-09-271-1/+6
|\ \ \ | | | | | | | | | | | | | | | | 33ec71f3 FindMatlab: Fix -pthread check for projects with only C enabled
| * | | FindMatlab: Fix -pthread check for projects with only C enabledJamie Snape2016-09-261-1/+6
| | | |
* | | | Merge topic 'CPackNSIS-per-component-install'Brad King2016-09-271-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 06dea230 CPack/NSIS: Add custom component install directory
| * | | | CPack/NSIS: Add custom component install directoryRoman Wüger2016-09-261-0/+5
| | |/ / | |/| |
* | | | Merge topic 'FindBoost-1.62'Brad King2016-09-271-0/+16
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | 9bb8ac8e FindBoost: update to 1.62
| * | | FindBoost: update to 1.62Tatsuyuki Ishi2016-09-251-0/+16
| | | |
* | | | Merge topic 'xcode-sdk-version'Brad King2016-09-261-2/+4
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | 540815ee Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path
| * | | Xcode: Convert maybe unversioned OSX sysroot into versioned SDK pathGregor Jasny2016-09-251-2/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with Xcode 8 the SDK folder also contains an unversioned entry: $ ls -l /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs drwxr-xr-x 5 root wheel 170 Mar 4 2018 MacOSX.sdk lrwxr-xr-x 1 root wheel 10 Sep 16 20:49 MacOSX10.12.sdk -> MacOSX.sdk If this unversioned path is used CMake cannot detect the SDK version. To work around the problem we always invoke the code path that translates short SDK names like "macosx10.12" into a path. That way we always end up with a versioned SDK path in _CMAKE_OSX_SYSROOT_PATH which is later used to determine the version. Closes: #16323
* | | Merge topic 'revert-cpack-deb-package-description-fallback'Brad King2016-09-261-22/+21
|\ \ \ | | | | | | | | | | | | | | | | 1ef45a30 Revert "CPack/DEB: Make package description variable precedence match RPM"
| * | | Revert "CPack/DEB: Make package description variable precedence match RPM"Domen Vrankar2016-09-241-22/+21
| |/ / | | | | | | | | | | | | This reverts commit 332b089ad213a1aa89658fffd8f68c9064c6d3db as multiline descriptions require special formatting.
* | | Merge topic 'xcode-swift-version'Brad King2016-09-262-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | b35568f3 Xcode: Add option to set Swift language version 49d50ad4 Xcode: Port rudimentary Swift support to Xcode 8
| * | | Xcode: Port rudimentary Swift support to Xcode 8Brad King2016-09-232-0/+6
| |/ / | | | | | | | | | | | | | | | The `.pbxproj` file must now specify a `SWIFT_VERSION` value. Set it to the legacy value of "2.3" for now. Later this can be made configurable (e.g. to "3.0").
* | | FindMatlab: Add EXECUTABLE, MODULE, and SHARED options to matlab_add_mexJamie Snape2016-09-231-4/+24
| | |
generated by cgit v0.12 at 2025-01-25 19:20:01 (GMT)