summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-host-x64-tools'Brad King2016-10-142-0/+8
|\ | | | | | | | | | | d079e71c VS: Provide an option to use x64 host tools 779939a0 Help: Document VS and Xcode toolset selection
| * VS: Provide an option to use x64 host toolsBrad King2016-10-142-0/+8
| | | | | | | | | | | | | | | | | | | | Visual Studio provides toolchains that are themselves built for 32-bit or 64-bit host architectures. By default it uses the 32-bit tools, but it can be told to prefer the 64-bit tools on 64-bit hosts. Extend the `CMAKE_GENERATOR_TOOLSET` specification to provide a way to request use of the 64-bit host tools. Closes: #15622
* | Merge topic 'FindBoost-minor-cleanup'Brad King2016-10-141-13/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | 08b9a0fd FindBoost: Simplify library dir detection with cascading if/elseif/else ca4029fa FindBoost: Minor style updates 2e242b5c FindBoost: Use list(INSERT) to simplify suffix list generation 6699d46a FindBoost: Use string(APPEND) in more cases
| * | FindBoost: Simplify library dir detection with cascading if/elseif/elseAlex Turbov2016-10-131-6/+4
| | |
| * | FindBoost: Minor style updatesAlex Turbov2016-10-131-2/+2
| | |
| * | FindBoost: Use list(INSERT) to simplify suffix list generationAlex Turbov2016-10-131-1/+1
| | |
| * | FindBoost: Use string(APPEND) in more casesAlex Turbov2016-10-131-4/+4
| | |
* | | Merge topic 'ice-3.6.3'Brad King2016-10-131-0/+1
|\ \ \ | | | | | | | | | | | | | | | | 6e5a3655 FindIce: Add support for version 3.6.3
| * | | FindIce: Add support for version 3.6.3Roger Leigh2016-10-131-0/+1
| | | |
* | | | Merge topic 'FindSDL-mingw-mwindows'Brad King2016-10-131-4/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 632326a7 FindSDL: Add -mwindows to link flags for MinGW, correct wording
| * | | | FindSDL: Add -mwindows to link flags for MinGW, correct wordingEmil Laine2016-10-121-4/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The `-mwindows` flag is needed to avoid creating an additional console window when starting SDL applications built with MinGW. There is no `mwindows` library. See also https://cygwin.com/ml/cygwin/2007-04/msg00027.html
* | | | Merge topic 'FindProtobuf-debug-suffix'Brad King2016-10-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d9190f33 FindProtobuf: Search for debug library named with `d` suffix
| * | | | FindProtobuf: Search for debug library named with `d` suffixAdam Martin2016-10-101-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protobuf now provides a CMake-based build system that optionally adds a suffix to the debug library name [1]. Update our `find_library` call to consider names with the default value for this suffix, `d`. [1] https://github.com/google/protobuf/blob/431cee60/cmake/libprotoc.cmake#L107
* | | | Merge topic 'remove-obsolete'Brad King2016-10-131-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | b6a174d2 Makefiles: Remove query for CMAKE_OBJECT_NAME d0faa58a Makefiles: Remove forbidden flag logic
| * | | | Makefiles: Remove forbidden flag logicStephen Kelly2016-10-091-2/+0
| | |_|/ | |/| | | | | | | | | | This might have been needed some day in the past, but not anymore.
* | | | Merge topic 'ExternalProject-fix-CMAKE_CACHE_ARGS-list'Brad King2016-10-131-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | a3c98cb3 ExternalProject: Fix regression in passing list to CMAKE_CACHE_ARGS
| * | | 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 topic 'android-cxxabi'Brad King2016-10-101-0/+2
|\ \ \ | | | | | | | | | | | | | | | | 8cdac469 Android: Fix support for cxxabi.h with libc++
| * | | 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 topic 'FindProtobuf-fix-subdirs'Brad King2016-10-101-6/+10
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | 2b9dad69 FindProtobuf: Fix protobuf_generate_*() to handle subdirs
| * | | 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.
* | | CPack/RPM single debuginfo packagingDomen Vrankar2016-10-071-51/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | Generate a single debuginfo package even if components packaging is enabled. This makes issue #15668 resolution feature complete. Closes: #15486
* | | CPack/RPM learned defining main componentDomen Vrankar2016-10-071-5/+30
| | | | | | | | | | | | | | | | | | Main component rpm package is generated without component suffix in filename and package name.
* | | Merge topic 'android-ndk-r13'Brad King2016-10-071-1/+7
|\ \ \ | | |/ | |/| | | | | | | | | | 0c3a0477 Android: Update libc++ include directories for NDK r13 ebef3632 Android: Suppress -Wattributes warnings in test case builds
| * | 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 topic 'cpack-rpm-debuginfo-fixes'Brad King2016-10-071-28/+40
|\ \ | | | | | | | | | | | | | | | f53b01ff CPack/RPM debuginfo package without binaries ca50c89e CPack/RPM debuginfo package objdump error suppression
| * | 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 topic 'FindMatlab-documentation'Brad King2016-10-061-8/+7
|\ \ | | | | | | | | | | | | | | | f2b88600 Help: Extend 3.7 release notes for FindMatlab 2f16ab87 FindMatlab: small documentation fixes
| * | FindMatlab: small documentation fixesRaffi Enficiaud2016-10-051-8/+7
| |/
* | FindMatlab: remove SIMULINK path from cache when FindMatlab is reconfiguredRaffi Enficiaud2016-10-051-0/+1
|/
* 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.