summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-cmake-E-env_vs8_wince'Brad King2016-07-131-26/+2
|\ | | | | | | | | | | 047862d3 cmake: Fix -E env_vs8_wince implementation b7a94fbb cmake: Drop unused -E cmake_call_visual_studio_macro code
| * cmake: Fix -E env_vs8_wince implementationBrad King2016-07-111-2/+2
| | | | | | | | | | | | | | | | | | This code has accidentally not been compiled since commit v3.0.0-rc1~556^2 (cmake: Split -E command implementation into separate source file, 2013-10-03) because CMAKE_HAVE_VS_GENERATORS was local to `cmake.cxx`. Fixes #16195.
| * cmake: Drop unused -E cmake_call_visual_studio_macro codeBrad King2016-07-111-24/+0
| | | | | | | | | | | | This code has not been compiled since commit v3.0.0-rc1~556^2 (cmake: Split -E command implementation into separate source file, 2013-10-03). It appears the code was never used since it was added anyway.
* | Merge topic 'cpack-rpm-debug-logging-fix'Brad King2016-07-131-1/+3
|\ \ | | | | | | | | | | | | 83799aa9 CPack/RPM: Debug logging should only print if requested for
| * | CPack/RPM: Debug logging should only print if requested forHarry Mallon2016-07-131-1/+3
| |/
* | Merge topic 'fix-cpack-rpm-different-package-names'Brad King2016-07-131-0/+1
|\ \ | | | | | | | | | | | | 672e6d2e CPack/RPM: Add missed CPACK_RPM_FILE_NAME fallback variable
| * | CPack/RPM: Add missed CPACK_RPM_FILE_NAME fallback variableAlex Turbov2016-07-111-0/+1
| | | | | | | | | | | | | | | | | | In commit v3.6.0-rc1~66^2 (CPack/RPM different package names, 2016-05-15) we forgot the non-uppercased fallback variable name `CPACK_RPM_<COMPONENT>_FILE_NAME`. Add it now.
* | | Merge topic 'find-command-restore-PATH-on-unix'Brad King2016-07-131-4/+2
|\ \ \ | | | | | | | | | | | | | | | | 54475018 Restore find_(library|file|path) search of PATH itself
| * | | Restore find_(library|file|path) search of PATH itselfBrad King2016-07-111-4/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit commit v3.6.0-rc1~82^2 (Drop find_(library|file|path) prefixes from PATH on non-Windows, 2016-05-09) aggressively dropped search of the entries in PATH itself in addition to the prefixes derived from it. This regresses find modules that (incorrectly) depended on the behavior, including some of our own modules such as FindImageMagick. Restore the search of entries in PATH itself. If we want to drop it later we will need to do so with a policy. Fixes #16192.
* | | Merge topic 'windows-export-all-from-exe'Brad King2016-07-1313-51/+98
|\ \ \ | | | | | | | | | | | | | | | | | | | | 9da725cb Windows: Honor WINDOWS_EXPORT_ALL_SYMBOLS for executables with exports 2005b960 Makefile: Factor out WINDOWS_EXPORT_ALL_SYMBOLS helper
| * | | Windows: Honor WINDOWS_EXPORT_ALL_SYMBOLS for executables with exportsYury Zhuravlev2016-07-1110-9/+50
| | | | | | | | | | | | | | | | | | | | For executables with ENABLE_EXPORTS set, export all symbols when instructed to do so by WINDOWS_EXPORT_ALL_SYMBOLS.
| * | | Makefile: Factor out WINDOWS_EXPORT_ALL_SYMBOLS helperYury Zhuravlev2016-07-113-42/+48
| | | | | | | | | | | | | | | | | | | | | | | | Factor the implementation out of cmMakefileLibraryTargetGenerator into a helper method in cmMakefileTargetGenerator so it can be re-used elsewhere later.
* | | | Merge topic 'cmake-spelling'Brad King2016-07-135-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 56608618 Fix typos.
| * | | | Fix typos.Felix Geyer2016-07-105-5/+5
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-07-131-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-07-121-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'tiff-typo'Brad King2016-07-111-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7959d518 FindTIFF: Correct variable names in unit test
| * | | | FindTIFF: Correct variable names in unit testRoger Leigh2016-07-101-7/+7
| |/ / /
* | | | Merge topic 'add-gitignore'Brad King2016-07-114-7/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | b4811f3e Tell Git to ignore .DS_Store files 4786ec51 Source: Remove long-unused .cvsignore file
| * | | | Tell Git to ignore .DS_Store filesBrad King2016-07-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are created by MacOS Finder and should not be versioned. Suggested-by: Sean McBride <sean@rogue-research.com>
| * | | | Source: Remove long-unused .cvsignore fileBrad King2016-07-083-7/+2
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-07-111-1/+1
| |/ / / |/| | |
* | | | CMake Nightly Date StampKitware Robot2016-07-101-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2016-07-091-1/+1
|/ / /
* | | Merge topic 'ExternalProject-default-download-filename'Brad King2016-07-081-1/+6
|\ \ \ | | | | | | | | | | | | | | | | af7da934 ExternalProject: Use default file name if extracting from URL fails
| * | | ExternalProject: Use default file name if extracting from URL failsRuslan Baratov2016-07-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | The download/extract step uses the file name only internally so we can just use a fallback default name if one cannot be extracted from the URL.
* | | | CMake Nightly Date StampKitware Robot2016-07-081-1/+1
| | | |
* | | | Merge branch 'release'Brad King2016-07-070-0/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | CMake 3.6.0v3.6.0Brad King2016-07-071-1/+1
| | |
* | | Merge topic 'update-linux64-release'Brad King2016-07-071-4/+25
|\ \ \ | | | | | | | | | | | | | | | | ad7da08a Utilities/Release: Switch to Qt 5.7 for Linux x86_64 binary
| * | | Utilities/Release: Switch to Qt 5.7 for Linux x86_64 binaryBrad King2016-07-061-4/+25
| | | | | | | | | | | | | | | | | | | | Compile as C++11 since Qt 5.7 requires it. Limit use of glibc to 2.6 APIs and lower.
* | | | Merge topic 'toolchain-flag-init'Brad King2016-07-0756-174/+345
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a66004be Honor CMAKE_<LANG>_FLAGS[_<CONFIG>]_INIT set in toolchain files cdde77e5 OpenWatcom: Partially modernize platform information modules f9dbe22c Intel: Do not use GNU-like flags on Windows 5a3ed0d7 Intel: Do not use MSVC-like flags for Fortran
| * | | | Honor CMAKE_<LANG>_FLAGS[_<CONFIG>]_INIT set in toolchain filesBrad King2016-07-0648-151/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document these variables. Change our convention for setting these variables from: set(CMAKE_C_FLAGS_INIT "...") to string(APPEND CMAKE_C_FLAGS_INIT " ...") so that any value previously set by a toolchain file will be used. Automate the conversion with: sed -i 's/set *(\(CMAKE_\(C\|CXX\|Fortran\|RC\|ASM\|${[^}]\+}\)_FLAGS\(_[^_]\+\)\?_INIT \+"\)/string(APPEND \1 /' \ Modules/Compiler/*.cmake Modules/Platform/*.cmake and follow up with some manual fixes (e.g. to cases that already meant to append). Also revert the automated changes to contexts that are not protected from running multiple times.
| * | | | OpenWatcom: Partially modernize platform information modulesBrad King2016-07-065-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate from the old `<os>-<cc>.cmake` layout to the modern `<os>-<id>-<lang>.cmake` layout. Keep settings common to C and C++ in a `Windows-OpenWatcom.cmake` helper module with an include blocker. For now just add both C and CXX settings in the helper module.
| * | | | Intel: Do not use GNU-like flags on WindowsBrad King2016-07-055-24/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor options out of `Modules/Compiler/Intel-{ASM,C,CXX,Fortran}.cmake` into a common helper in `Modules/Compiler/Intel.cmake`. Condition them to be used only on non-Windows hosts where the Intel compiler is GNU-like instead of MSVC-like. Previously this worked only because the options were later overridden by `Modules/Platform/Windows-Intel*.cmake`, but it is cleaner to not set the options in the first place.
| * | | | Intel: Do not use MSVC-like flags for FortranBrad King2016-07-051-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach `Modules/Platform/Windows-MSVC.cmake` not to use MSVC options for Fortran. We use the `__windows_compiler_msvc` for the Intel Fortran compiler on Windows for other settings, but we do not want the flags. Previously this worked only because the options were later overridden by `Modules/Platform/Windows-Intel*.cmake`, but it is cleaner to not set the options in the first place.
* | | | | CMake Nightly Date StampKitware Robot2016-07-071-1/+1
| |/ / / |/| | |
* | | | Merge branch 'release'Brad King2016-07-060-0/+0
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Merge branch 'cpack-ifw-fix-repo-attributes' into releaseBrad King2016-07-051-2/+2
| |\ \
| * \ \ Merge branch 'FindJNI-ubuntu-paths' into releaseBrad King2016-07-051-3/+4
| |\ \ \
| * \ \ \ Merge branch 'clang-format-script' into releaseBrad King2016-06-301-4/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'doc-updates' into releaseBrad King2016-06-302-2/+18
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'windows-export-all-symbols'Brad King2016-07-061-3/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f8d4e3d7 bindexplib: Export symbols from objects even with explicit markup
| * | | | | | | bindexplib: Export symbols from objects even with explicit markupYury Zhuravlev2016-07-051-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop our `HaveExportedObjects` check before dumping exports for an object file. It is possible for only a subset of needed symbols to have explicit markup, and re-exporting the marked symbols does not hurt. This leaves no callers of `HaveExportedObjects`, but leave the method in place anyway because it may be useful in the future. Fixes #16161.
* | | | | | | | Merge topic 'ExternalProject-more-url-filenames'Brad King2016-07-061-7/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 57c337e2 ExternalProject: Match filenames in URLs with query strings and anchors
| * | | | | | | | ExternalProject: Match filenames in URLs with query strings and anchorsBrad King2016-07-051-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While at it, refactor logic to consolidate the filename extraction and verification into a single match. Inspired-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
* | | | | | | | | Merge topic 'FindJNI-cleanup'Brad King2016-07-061-2/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4e11c966 FindJNI: Improve formatting of FPHSA call
| * | | | | | | | | FindJNI: Improve formatting of FPHSA callO Libre2016-07-051-2/+5
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass one argument per line for better readability.
* | | | | | | | | Merge topic 'FindJNI-ubuntu-paths'Brad King2016-07-061-3/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | 26d16380 FindJNI: Fix support for Ubuntu 15.10
| * | | | | | | | FindJNI: Fix support for Ubuntu 15.10O Libre2016-07-051-3/+4
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The library search paths added by commit v3.6.0-rc1~281^2~1 (FindJNI: Add support for Ubuntu 15.10, 2016-03-08) were incorrect. Fix them.