summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'export-static-private-depend'Brad King2016-01-194-5/+26
|\ | | | | | | | | | | | | aea1b036 Fix export of STATIC library PRIVATE dependencies with CMP0022 NEW e5cbec14 Tests: Use CMP0022 NEW behavior in some ExportImport cases 0ca122fc Tests: Isolate policy changes in ExportImport test
| * Fix export of STATIC library PRIVATE dependencies with CMP0022 NEWBrad King2016-01-154-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The target_link_libraries command records the PRIVATE dependencies of a STATIC library in INTERFACE_LINK_LIBRARIES as "$<LINK_ONLY:dep>". This hides the target name from export namespacing logic inside a generator expression. When user-written generator expressions reference a target name they must put it inside a "$<TARGET_NAME:dep>" expression to allow the export logic to rename the target. In the case that the private dependency is not already a generator expression, target_link_libraries must use "$<LINK_ONLY:$<TARGET_NAME:dep>>" to allow the export logic to rename the target. Reported-by: Tamás Kenéz <tamas.kenez@gmail.com>
| * 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 'FindPkgConfig-fix-restore'Brad King2016-01-191-1/+1
|\ \ | | | | | | | | | | | | 8979a107 FindPkgConfig: Fix restoration of PKG_CONFIG_PATH in environment
| * | FindPkgConfig: Fix restoration of PKG_CONFIG_PATH in environmentRob Gowin2016-01-151-1/+1
| | | | | | | | | | | | | | | | | | The original value is saved in `_pkg_config_path_old`. Fix this typo left by commit v3.1.0-rc1~763^2 (FindPkgConfig: Extend PKG_CONFIG_PATH using CMake variables, 2014-03-06).
* | | Merge topic 'ExternalProject-git-clone-o'Brad King2016-01-192-6/+22
|\ \ \ | | | | | | | | | | | | | | | | 83d63391 ExternalProject: Add option to set `git clone -o` argument
| * | | ExternalProject: Add option to set `git clone -o` argumentAdam Rankin2016-01-152-6/+22
| |/ / | | | | | | | | | | | | | | | | | | | | | Add a `GIT_REMOTE_NAME` option to `ExternalProject_Add` to support git clone --origin <name> Default to `origin` if not specified.
* | | Merge topic 'doc-export-compile-commands'Brad King2016-01-192-0/+31
|\ \ \ | | | | | | | | | | | | | | | | 6e92f7b2 Help: Document the CMAKE_EXPORT_COMPILE_COMMANDS variable
| * | | Help: Document the CMAKE_EXPORT_COMPILE_COMMANDS variableSebastian Schuberth2016-01-152-0/+31
| |/ /
* | | Merge topic 'FindCUDA-verbatim'Brad King2016-01-191-0/+3
|\ \ \ | | | | | | | | | | | | | | | | 6ccc3070 FindCUDA: Support special characters in path (#15919)
| * | | FindCUDA: Support special characters in path (#15919)Brad King2016-01-151-0/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | Add `VERBATIM` to all `add_custom_command` calls so that CMake will escape arguments properly even when special characters such as "()" are present. Suggested-by: Nils Gladitz <nilsgladitz@gmail.com>
* | | Merge topic 'rpath-preserve-compiler-defined'Brad King2016-01-192-13/+30
|\ \ \ | | | | | | | | | | | | | | | | 3ec92267 install: Do not remove compiler-defined RPATH entries
| * | | install: Do not remove compiler-defined RPATH entriesLior Goldberg2016-01-152-13/+30
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some compilers may add their own RPATH entries when invoking the linker. For example, a GCC installation may contain the following definition in the specs file: *link_libgcc: %D -rpath <<some specific rpath in which libstdc++.so can be found>> In this case binaries may contain RPATH entries that CMake did not add. When we update the RPATH on installation we must preserve these entries even if CMake thinks the INSTALL_RPATH value should be empty. Fix this by always using file(RPATH_CHANGE) and teach it to behave as file(RPATH_REMOVE) if the actual RPATH in the file is empty after replacing the build-tree RPATH with the install-tree RPATH. This will preserve any compiler-added RPATH value instead of removing it.
* | | Merge topic 'windows-program-files'Brad King2016-01-191-33/+19
|\ \ \ | | | | | | | | | | | | | | | | 09b2f1c3 Windows: Find Program Files directories more robustly from environment
| * | | Windows: Find Program Files directories more robustly from environmentBrad King2016-01-151-33/+19
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Modules/Platform/WindowsPaths.cmake our previously recorded environment variable combinations no longer seem to be correct. For example, a 64-bit cmake binary may see ProgramW6432 in the environment and end up not considering the "ProgramFiles(x86)" variable. Instead check for all possible environment variables in the preferred order and then remove duplicates. Reported-by: Shawn Waldon <shawn.waldon@kitware.com>
* | | CMake Nightly Date StampKitware Robot2016-01-191-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2016-01-181-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2016-01-171-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2016-01-161-1/+1
|/ /
* | CMake Nightly Date StampKitware Robot2016-01-151-1/+1
|/
* 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)
generated by cgit v0.12 at 2025-02-02 10:07:16 (GMT)