summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'macro-parenthesis'Brad King2016-09-069-18/+19
|\ | | | | | | | | 1a9de803 surround macro arguments with parentheses
| * surround macro arguments with parenthesesDaniel Pfeifer2016-09-059-18/+19
| |
* | Merge topic 'cm_nullptr'Brad King2016-09-064-10/+12
|\ \ | | | | | | | | | | | | 0039ffa2 use CM_NULLPTR
| * | use CM_NULLPTRDaniel Pfeifer2016-09-054-10/+12
| |/
* | Merge topic 'qtdialog-tidy'Brad King2016-09-069-33/+51
|\ \ | | | | | | | | | | | | 62c5f9af QtDialog: fix clang-tidy warnings
| * | QtDialog: fix clang-tidy warningsDaniel Pfeifer2016-09-069-33/+51
| |/
* | CMake Nightly Date StampKitware Robot2016-09-061-1/+1
| |
* | Merge topic 'include-what-you-use'Brad King2016-09-0526-36/+116
|\ \ | | | | | | | | | | | | 32f756c8 CursesDialog: include what you use
| * | CursesDialog: include what you useDaniel Pfeifer2016-09-0326-36/+116
| |/
* | Merge topic 'tidy-readability-redundant-string-cstr'Brad King2016-09-059-67/+60
|\ \ | | | | | | | | | | | | 60dcaaea tidy: Fix readability-redundant-string-cstr issues
| * | tidy: Fix readability-redundant-string-cstr issuesGregor Jasny2016-09-049-67/+60
| | |
* | | CMake Nightly Date StampKitware Robot2016-09-051-1/+1
|/ /
* | CMake Nightly Date StampKitware Robot2016-09-041-1/+1
|/
* Merge topic 'include-what-you-use'Brad King2016-09-03204-415/+1222
|\ | | | | | | | | | | | | | | | | efed6468 fix a load of include-what-you-use violations bd3d0eaf cmCTest: don't redefine cout and cerr 3838a0d5 make sure to include cmConfigure.h before cmStandardIncludes.h 54140848 Tests/CMakeLib: include what you use 3f9c4cdf Tests/CMakeLib: use cmsys::ifstream
| * fix a load of include-what-you-use violationsDaniel Pfeifer2016-09-03165-438/+1102
| |
| * cmCTest: don't redefine cout and cerrDaniel Pfeifer2016-09-031-10/+0
| | | | | | | | | | | | | | | | The definitions have been introduced to ensure that cout and cerr are not used in certain files. However, this limitation does not apply to all source files that require cmCTest.h to be included. Furthermore, the definitions cause side effects depending on the include order. In total, the definitions do more harm than good. Remove them.
| * make sure to include cmConfigure.h before cmStandardIncludes.hDaniel Pfeifer2016-09-0372-1/+145
| |
| * Tests/CMakeLib: include what you useDaniel Pfeifer2016-09-033-4/+7
| |
| * Tests/CMakeLib: use cmsys::ifstreamDaniel Pfeifer2016-09-032-10/+16
| |
* | Merge topic 'libuv-scanbuild-fixes'Brad King2016-09-033-10/+7
|\ \ | | | | | | | | | | | | | | | c03a7b4f CTestCustom: Suppress scan-build warnings in libuv 3825a564 libuv: Simplify variable initializations to satisfy Clang scan-build
| * | CTestCustom: Suppress scan-build warnings in libuvBrad King2016-09-031-0/+3
| | | | | | | | | | | | | | | | | | | | | Clang scan-build warns in some expansions of RB_GENERATE_STATIC that it has a "Dereference of null pointer". It also warns that "The left operand of '==' is a garbage value" strangely. Simply suppress these since this is third-party code anyway.
| * | libuv: Simplify variable initializations to satisfy Clang scan-buildBrad King2016-09-012-10/+4
| | | | | | | | | | | | | | | The Clang scan-build tool warns about assignments whose values are never used, so initialize local variables at declaration instead.
* | | Merge topic 'FindHDF5-is-parallel'Brad King2016-09-031-8/+60
|\ \ \ | | | | | | | | | | | | | | | | b61eab24 FindHDF5: Fix regression in providing HDF5_IS_PARALLEL
| * | | FindHDF5: Fix regression in providing HDF5_IS_PARALLELBrad King2016-09-021-8/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.6.0-rc1~85^2 (HDF5: Refactor the use of compiler wrappers, 2016-04-01) we have additional code paths that find HDF5 and suppress the original search logic. Report HDF5_IS_PARALLEL from these other code paths too. Closes: #16257
* | | | Merge topic 'FindHDF5-fix-hl-fortran'Brad King2016-09-031-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | befe8648 FindHDF5: Fix regression in finding hdf5hl_fortran
| * | | FindHDF5: Fix regression in finding hdf5hl_fortranBrad King2016-09-021-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.6.0-rc1~72^2 (HDF5: Rework component searching to correctly find HL for all bindings, 2016-05-12) accidentally dropped the name `hdf5hl_fortran` from the list of library names and replaced it with `hdf5_hl_fortran`. IIUC the latter name is when HDF5 is built with CMake and the former name is for other build systems. Since this is the non-CMake code path, user the former name. Closes: #16233
* | | CMake Nightly Date StampKitware Robot2016-09-031-1/+1
| | |
* | | Merge branch 'release'Brad King2016-09-020-0/+0
|\ \ \
| * \ \ Merge branch 'vs14-debug-enum-older-toolsets' into releaseBrad King2016-09-011-1/+3
| |\ \ \
| * \ \ \ Merge branch 'vs-NsightTegra-empty-version' into releaseBrad King2016-08-261-5/+4
| |\ \ \ \
* | \ \ \ \ Merge topic 'autogen-base32'Brad King2016-09-024-12/+157
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 228f4e9b cmFilePathUuid: Use Base32 string instead of Base64 string b481ddb3 Add cmBase32Encoder class
| * | | | | | cmFilePathUuid: Use Base32 string instead of Base64 stringSebastian Holtermann2016-09-021-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This produces files that will not collide on a case-insensitive filesystem. It also avoids the need for special character substitutions.
| * | | | | | Add cmBase32Encoder classSebastian Holtermann2016-09-023-0/+151
| | |_|_|_|/ | |/| | | |
* | | | | | Merge topic 'GenerateExportHeader-fix-add_compiler_export_flags'Brad King2016-09-021-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0cbaaf2d GenerateExportHeader: Fix add_compiler_export_flags regression
| * | | | | | GenerateExportHeader: Fix add_compiler_export_flags regressionBrad King2016-09-011-1/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mechanical conversion in commit 5d0d980d (Use string(APPEND) in Modules, 2016-07-28) accidentally introduced use of string(APPEND ... PARENT_SCOPE) Split that into the string(APPEND) and set(PARENT_SCOPE) pieces.
* | | | | | Merge topic 'vs14-debug-enum-older-toolsets'Brad King2016-09-021-1/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | 9998774f VS: Fix VS 2015 .vcxproj debug setting for v80 toolset
| * | | | | VS: Fix VS 2015 .vcxproj debug setting for v80 toolsetBrad King2016-09-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Closes: #16281
* | | | | | CMake Nightly Date StampKitware Robot2016-09-021-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'FindEXPAT-use-PkgConfig'Brad King2016-09-011-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fc695a77 FindEXPAT: use hints from PkgConfig
| * | | | | FindEXPAT: use hints from PkgConfigChristoph Junghans2016-08-311-2/+6
| | | | | |
* | | | | | Merge topic 'FindCUDA-fixes'Brad King2016-09-011-10/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 900ee0b8 FindCUDA: Allow cuda_compile* macros to be called more than once per directory 6442709b FindCUDA: Fix for broken cuda_compile* commands.
| * | | | | | FindCUDA: Allow cuda_compile* macros to be called more than once per directoryStephen Sorley2016-08-311-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a counter as a directory property that gets incremented every time one of the cuda_compile* macros is called. The value of this counter is then added to the phony target name passed to CUDA_WRAP_SRCS. This ensures that every call to one of these macros has its own unique intermediate output directory.
| * | | | | | FindCUDA: Fix for broken cuda_compile* commands.Stephen Sorley2016-08-311-9/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The macros CUDA_COMPILE, CUDA_COMPILE_PTX, CUDA_COMPILE_FATBIN, and CUDA_COMPILE_CUBIN were broken by commit 7ded655 (FindCUDA: Take NVCC include directories from target properties, 2016-08-16). This bug is due to the fact that all of these macros call CUDA_WRAP_SRCS with a target name that's not an actual target, causing the new generator expressions to fail. Fix the bug by changing these macros to pass "PHONY" to CUDA_WRAP_SRCS. Now, when CUDA_WRAP_SRCS sees "PHONY", it falls back to the old behavior of populating the include directories and compile definitions from directory properties, instead of using target generator expressions.
* | | | | | | Merge topic 'install-directory-genex-fix'Brad King2016-09-012-1/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3bd55dba install: Fix evaluation of leading generator expressions in DIRECTORY
| * | | | | | | install: Fix evaluation of leading generator expressions in DIRECTORYYves Frederix2016-08-312-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.5.0-rc1~58^2 (install: Allow generator expressions in DIRECTORY, 2016-01-12) we accidentally treat leading generator expressions as relative paths even though they may evaluate to absolute paths. Defer the conversion to an absolute path until after evaluation.
* | | | | | | | CMake Nightly Date StampKitware Robot2016-09-011-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'doc-XCODE-variable'Brad King2016-08-312-0/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | 3e8615ef Document XCODE variable
| * | | | | | Document XCODE variableRuslan Baratov2016-08-312-0/+5
| | | | | | |
* | | | | | | Merge topic '16101-xcode-fix-directory-exclude-from-all'Brad King2016-08-319-11/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df32e564 Xcode: Add targets marked as EXCLUDE_FROM_ALL to project (#16101)
| * | | | | | | Xcode: Add targets marked as EXCLUDE_FROM_ALL to project (#16101)Gregor Jasny2016-08-319-11/+41
| | | | | | | |