summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests: Use CMP0022 NEW behavior in some ExportImport casesBrad King2016-01-151-0/+3
|
* Tests: Isolate policy changes in ExportImport testBrad King2016-01-151-2/+5
| | | | Use cmake_policy(PUSH/POP) to isolate CMP0022 policy changes.
* Merge topic 'FindDCMTK-update'Brad King2016-01-141-46/+229
|\ | | | | | | | | | | | | | | | | | | 4b24626e FindDCMTK: Simplify documentation. 361c199f FindDCMTK: Add reStructuredText formatting. d790f4fe FindDCMTK: Keep original copyright notice. 8c8e53d0 FindDCMTK: Minor documentation grammatical issues. d50cbbb0 FindDCMTK: Obey QUIET option for find_package. 31b4700e FindDCMTK: Improve compatibility with DCMTKConfig.cmake.
| * FindDCMTK: Simplify documentation.Matt McCormick2016-01-141-40/+18
| |
| * FindDCMTK: Add reStructuredText formatting.Matt McCormick2016-01-121-47/+51
| |
| * FindDCMTK: Keep original copyright notice.Matt McCormick2016-01-121-1/+1
| | | | | | | | | | | | This is a follow-up to 31b4700ed640bee962f9db9ce25fa84261a944d2. Remove the extra character that was added to ensure the CMake.ModuleNotices test passes.
| * FindDCMTK: Minor documentation grammatical issues.Matt McCormick2016-01-121-9/+4
| | | | | | | | Also remove CTK integration reference to avoid confusion.
| * FindDCMTK: Obey QUIET option for find_package.Matt McCormick2016-01-111-5/+17
| |
| * FindDCMTK: Improve compatibility with DCMTKConfig.cmake.Jean-Christophe Fillion-Robin2016-01-111-45/+239
| | | | | | | | | | | | | | | | | | | | This improvement to the FindDCMTK module improves compatibility with recent DCMTK, which provides a DCMTKConfig.cmake file. See the module comments for a compatibility matrix. It also provides DCMTK_INCLUDE_DIRS. Ported from CommonTK (commontk.org).
* | Merge topic 'report_failed_tests'Brad King2016-01-141-2/+2
|\ \ | | | | | | | | | | | | a7393cbd ctest_test: Report which tests failed even when QUIET is used
| * | ctest_test: Report which tests failed even when QUIET is usedZack Galbreath2016-01-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.3.0-rc1~410^2~3 (ctest_test: Add QUIET option, 2015-02-17) if tests fail when QUIET is used one sees: The following tests FAILED: but not the subsequent line(s) indicating which tests failed. Restore the list of failed tests.
* | | Merge topic 'bootstap-system-liblzma'Brad King2016-01-141-2/+4
|\ \ \ | | | | | | | | | | | | | | | | 7a37afa7 bootstrap: Add option to build with system liblzma (#15916)
| * | | bootstrap: Add option to build with system liblzma (#15916)Brad King2016-01-131-2/+4
| |/ /
* | | Merge topic 'install-DIRECTORY-genex'Brad King2016-01-1411-13/+50
|\ \ \ | | | | | | | | | | | | | | | | 630c8aa8 install: Allow generator expressions in DIRECTORY
| * | | install: Allow generator expressions in DIRECTORYYves Frederix2016-01-1311-13/+50
| | | | | | | | | | | | | | | | | | | | Teach install(DIRECTORY) to support generator expressions in the list of directories, much like install(FILES) already supports.
* | | | CMake Nightly Date StampKitware Robot2016-01-141-1/+1
| |/ / |/| |
* | | Merge topic 'vs-debug-fastlink'Brad King2016-01-132-0/+7
|\ \ \ | | | | | | | | | | | | | | | | fc5d6592 VS: Map link `/debug:fastlink` flag to VS 2015 IDE property (#15894)
| * | | VS: Map link `/debug:fastlink` flag to VS 2015 IDE property (#15894)Brad King2016-01-122-0/+7
| |/ / | | | | | | | | | Suggested-by: Thomas Laguzzi <tholag@gmail.com>
* | | Merge topic 'cmake-W-options'Brad King2016-01-1332-37/+532
|\ \ \ | | | | | | | | | | | | | | | | | | | | 82166701 cmake-gui: Add options to control warning-as-error messages 28f2d750 Add -Werror and -Wno-error command-line options
| * | | cmake-gui: Add options to control warning-as-error messagesMichael Scott2016-01-125-2/+161
| | | | | | | | | | | | | | | | | | | | Add new widgets to the warning messages dialog to control treating warnings as errors.
| * | | Add -Werror and -Wno-error command-line optionsMichael Scott2016-01-1227-35/+371
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Expand the -W set of cmake options to include support for the -Werror and -Wno-error format, which is used to control upgrading and downgrading warning and error messages. Implement support for these new formats for the dev and deprecated message types. Add tests and updated documentation for new options.
* | | Merge topic 'FindPkgConfig-share-dir'Brad King2016-01-131-0/+1
|\ \ \ | | | | | | | | | | | | | | | | 36d87e18 FindPkgConfig: add PREFIX/share/pkgconfig to PKG_CONFIG_PATH (#15910)
| * | | FindPkgConfig: add PREFIX/share/pkgconfig to PKG_CONFIG_PATH (#15910)Sam Thursfield2016-01-121-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Most packages install their .pc files into PREFIX/lib/pkgconfig, but some put them into PREFIX/share/pkgconfig. Either is valid, and pkg-config itself looks in both for the /usr and /usr/local prefixes. This fixes an issue where some packages (yajl, for example) are not found if they are installed into a non-standard prefix and CMAKE_PREFIX_PATH is used to locate them.
* | | Merge topic 'update-kwsys'Brad King2016-01-132-0/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | 33cafa68 Merge branch 'upstream-KWSys' into update-kwsys ffcc235c KWSys 2016-01-11 (bc07fbf7)
| * \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-01-122-0/+11
| |\ \ \ | | |/ / | |/| | | | | | | | | | * upstream-KWSys: KWSys 2016-01-11 (bc07fbf7)
| | * | KWSys 2016-01-11 (bc07fbf7)KWSys Upstream2016-01-122-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit bc07fbf7a884713815b3ac72d85487bf6aa338f5 (master). Upstream Shortlog ----------------- James Johnston (1): bc07fbf7 Configure: Silence spurious warnings from Embarcadero compiler.
* | | | CMake Nightly Date StampKitware Robot2016-01-131-1/+1
|/ / /
* | | Merge branch 'release'Brad King2016-01-120-0/+0
|\ \ \
| * \ \ Merge branch 'vs14-debug-enum' into releaseBrad King2016-01-111-2/+18
| |\ \ \
| * \ \ \ Merge branch 'vs-compiler-id-itanium' into releaseBrad King2015-12-211-3/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | Merge topic 'vs-win10-sdk'Brad King2016-01-123-17/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a57caf7e VS: Fix Windows 10 SDK version selection (#15831) ad594de8 cmSystemTools: Add VersionCompareEqual helper c173e37f VS: Do not select a partial Windows 10 SDK folder (#15831)
| * | | | | VS: Fix Windows 10 SDK version selection (#15831)Brad King2016-01-111-17/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.4.0-rc1~5^2~1 (VS: Add support for selecting the Windows 10 SDK, 2015-09-30) we added Windows 10 SDK selection choosing the most recent SDK that is not newer than the target version. This is backward because it should be up to the application code to not use APIs newer than the target version. It is up to the build system to provide a SDK that has at least the APIs expected to be available for the target version. Furthermore, since the default target version is the host version of Windows, the old approach breaks when the only SDK available is for a newer version of Windows. Fix this by always selecting a Windows 10 SDK if one exists. Use the SDK for the exact version if is available. Otherwise use the latest version of the SDK available because that will have at least the APIs expected for the target version.
| * | | | | cmSystemTools: Add VersionCompareEqual helperBrad King2016-01-112-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Wrap a call to VersionCompare with OP_EQUAL.
| * | | | | VS: Do not select a partial Windows 10 SDK folder (#15831)Brad King2016-01-081-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip SDK candidate folders that do not contain <um/windows.h> as they are not full SDKs.
* | | | | | Merge topic 'FindwxWidgets-use-isystem'Brad King2016-01-121-12/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d05f195 FindwxWidgets: Drop suppression of -isystem
| * | | | | | FindwxWidgets: Drop suppression of -isystemBrad King2016-01-111-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was added by commit v2.8.0~2292 (... Set variable wxWidgets_INCLUDE_DIRS_NO_SYSTEM on the Mac ..., 2008-04-16) and updated by commit v2.8.9~183^2 (FindwxWidgets: Do not use -isystem on OpenBSD, 2012-05-14). Since the underlying cause was never investigated fully we do not know the conditions under which -isystem breaks wxWidgets, but suppressing -isystem is problematic for users that do not want to see warnings in wxWidgets headers. Simply drop the special case for now so we can see whether anyone hits the problem again, at which point it can be investigated in more detail. Reported-by: Simon Wells <swel024@gmail.com>
* | | | | | | Merge topic 'update-kwsys'Brad King2016-01-123-19/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9821924d Merge branch 'upstream-KWSys' into update-kwsys 8e7356a2 KWSys 2016-01-11 (e8bf616e)
| * \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-01-113-19/+10
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | * upstream-KWSys: KWSys 2016-01-11 (e8bf616e)
| | * | | | | KWSys 2016-01-11 (e8bf616e)KWSys Upstream2016-01-113-19/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit e8bf616e3556368bf19dbebcd3529a89011ebacb (master). Upstream Shortlog ----------------- Brad King (1): e8bf616e SystemTools: Fix GetShortPath buffer sizing Jan van Dorsten (1): cfb2477d SystemTools: Simplify GetShortPath de-quoting step Robert Maynard (1): 8ef9773d Don't use clang diagnostic pragma's when compiling with ICC on OSX.
* | | | | | | Merge topic 'mingw-clang-compile-features'Brad King2016-01-122-2/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3baca636 Record compile features for MinGW Clang on Windows (#15897)
| * | | | | | | Record compile features for MinGW Clang on Windows (#15897)Brad King2016-01-112-2/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the 'UNIX' condition on Clang compiler features. This enables use of compile features with MinGW Clang, though additional work may be needed for clang-cl.
* | | | | | | Merge topic 'vs-global-properties'Brad King2016-01-122-0/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af39f115 VS: Implement VS_GLOBAL_* target properties in VS 2010+ (#13666)
| * | | | | | | VS: Implement VS_GLOBAL_* target properties in VS 2010+ (#13666)Mike Fitzgerald2016-01-112-0/+31
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | These have been documented but previously only implemented for VS 2008 and below.
* | | | | | | Merge topic 'vs-link-debug-property'Brad King2016-01-127-25/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b3677b35 VS: Map the link `/debug` to its IDE property c22da7cf VS: Drop unused condition in link debug flag generation 4ca9df8b cmIDEOptions: Add support for case-insensitive flags
| * | | | | | | VS: Map the link `/debug` to its IDE propertyBrad King2016-01-115-23/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the link flag table entries for this flag to be case-insensitive. Also fix the VS 2015 value for the build property enumeration name. This causes `linkOptions.Parse(...)` to correctly extract the `/debug` flag and map it to the IDE property instead. Therefore we do not need to look for the flag explicitly when initializing the property.
| * | | | | | | VS: Drop unused condition in link debug flag generationBrad King2016-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `linkOptions.IsDebug()` call never returns true because it checks for `DebugInformationFormat` which is a compiler (cl) flag.
| * | | | | | | cmIDEOptions: Add support for case-insensitive flagsBrad King2016-01-112-2/+9
| |/ / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2016-01-121-1/+1
|/ / / / / /
* | | | | | Merge topic 'vs14-debug-enum'Brad King2016-01-111-2/+18
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | f086c665 VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation (#15894)
| * | | | | VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation (#15894)Brad King2016-01-081-2/+18
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with VS 2015 the GenerateDebugInformation build property is an enumeration (`No`, `Debug`, `DebugFastLink`) instead of a boolean value (`false`, `true`). For now we simply change to `No` and `Debug` fix current behavior. Support for `/debug:fastlink` can be added later.