summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CSharpUtilities: Fix documentationMichael Stürmer2017-03-201-12/+20
| | | | Fixes: #16711
* CMake 3.8.0-rc2v3.8.0-rc2Brad King2017-03-031-1/+1
|
* Merge branch 'FindJNI-archlinux-jvm-paths' into releaseBrad King2017-03-031-0/+5
|\
| * FindJNI: Add jvm paths for Arch LinuxKitsu2017-03-031-0/+5
| |
* | Merge branch 'FindVulkan-update' into releaseBrad King2017-03-021-2/+6
|\ \
| * | FindVulkan: Update for LunarG SDK import library location on WindowsBrad Davis2017-03-021-2/+6
| |/ | | | | | | | | | | As of at least 1.0.42 of the LunarG SDK, the `vulkan-1.lib` import library on Windows is stored in `${VULKAN_SDK}/Lib` or `${VULKAN_SDK}/Lib32`.
* | Merge branch 'implicit-dir-symlinks' into releaseBrad King2017-03-0211-7/+91
|\ \
| * | Tests: Add case for RPATH exclusion of symlinks to implicit directoriesBrad King2017-03-029-0/+74
| | | | | | | | | | | | Issue: #16682
| * | Merge branch 'backport-implicit-dir-symlinks' into implicit-dir-symlinksBrad King2017-03-022-7/+17
| |\ \ | | |/ | |/|
| | * cmOrderDirectories: Consider symlinks when checking implicit directoriesBrad King2017-03-021-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When checking whether a directory is "implicit" (e.g. implicit link directory or implicit rpath directory), resolve the real path of both sides of the comparison. Otherwise we will not recognize paths like `/usr/lib32` as implicit when `/usr/lib` is implicit and `lib32` is actually a symlink to `lib`. This can lead to addition of unnecessary entries to the RPATH of a binary, for example. Fixes: #16682
| | * cmOrderDirectories: Factor out implicit directory checkBrad King2017-03-012-6/+11
| | |
* | | Merge branch 'csproj_add_free_source_tags' into releaseBrad King2017-03-0212-56/+410
|\ \ \
| * | | VS: add test for VS_CSHARP_* source file propertyMichael Stürmer2017-03-014-0/+38
| | | |
| * | | VS: add CSharpUtilities moduleMichael Stürmer2017-03-014-0/+305
| | | |
| * | | VS: add VS_CSHARP_<tagname> sourcefile propertyMichael Stürmer2017-03-015-56/+67
| |/ /
* | | Merge branch 'find-libarch-not-symlink' into releaseBrad King2017-02-284-16/+77
|\ \ \
| * | | find_library: Skip 'lib => lib<arch>' searches if one symlinks the otherBrad King2017-02-284-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `FIND_LIBRARY_USE_LIB<arch>_PATHS` global properties ask `find_library` to look in `lib<arch>` directories automatically before corresponding `lib` directories. However, if `lib<arch>` is just a symlink to `lib` (or vice-versa) then we should skip adding the `lib<arch>` path. Such symlinks typically only exist to satisfy software that expects the `lib<arch>` path to be available. Fixes: #16687
| * | | cmFindLibraryCommand: Refactor AddArchitecturePath logicBrad King2017-02-281-16/+26
| | |/ | |/| | | | | | | | | | Use boolean variables to save results and rename variables to more closely represent their roles.
* | | Merge branch 'kwiml-test-gcc-format-security' into releaseBrad King2017-02-271-1/+1
|\ \ \
| * | | KWIML: Add -Wno-format-security to tolerate -Werror=format-securityOrion Poplawski2017-02-271-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | When compiling KWIML tests with `-Werror=format-security` we get error: -Wformat-security ignored without -Wformat Therefore we should disable both `format` and `format-security` together.
* | | Merge branch 'ExternalProject-checkout-clarify' into releaseBrad King2017-02-241-1/+1
|\ \ \
| * | | ExternalProject: Run `git checkout` with `--` to clarify argumentsBrad King2017-02-241-1/+1
| |/ / | | | | | | | | | | | | | | | | | | Fix the case when the tag name to be checked out also happens to match a path name. Fixes: #16678
* | | Merge branch 'object-library-compile-pdb' into releaseBrad King2017-02-242-1/+2
|\ \ \
| * | | Fix COMPILE_PDB_NAME when used on an OBJECT libraryBrad King2017-02-242-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | When `COMPILE_PDB_NAME` is used without `COMPILE_PDB_OUTPUT_DIRECTORY` we cannot fall back on the link `PDB_OUTPUT_DIRECTORY` for an object library because it has no link step. Fixes: #16674
* | | Merge branch 'ninja-no-full-path' into releaseBrad King2017-02-241-4/+3
|\ \ \
| * | | Revert "Ninja: Use full path for all source files"Brad King2017-02-241-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit v3.7.0-rc1~275^2 (Ninja: Use full path for all source files, 2016-08-05). Unfortunately using absolute paths can cause incorrect rebuilds due to ninja limitations. The ninja manual [1] explains: > ... using absolute paths, your depfile may result in a mixture of > relative and absolute paths. Paths used by other build rules need > to match exactly. Passing an absolute path to a source file to the compiler while using a relative path in the ninja build manifest can cause such mixture and lead to incorrect rebuilds. Simply revert the change for now. Note that there was a follow-up to the original change in commit v3.7.0-rc2~10^2 (Ninja: Fix RC language depfile generation with cmcldeps, 2016-10-13). We don't need to revert that because that change made the relevant code cleverly adapt to whatever variable we use to reference the source file. [1] https://ninja-build.org/manual.html#_deps Fixes: #16675 Issue: #13894
| * | | Merge branch 'fix-ctest_update-svn' into release-3.7Brad King2017-02-151-1/+4
| |\ \ \ | | |_|/ | |/| |
* | | | Merge branch 'vcxproj-indentation' into releaseBrad King2017-02-231-0/+1
|\ \ \ \
| * | | | VS: Fix .vcxproj indentationBrad King2017-02-231-0/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | In commit v3.8.0-rc1~87^2~1 (VS: added support for C#, 2017-01-09) we removed what looked like a no-op streaming operation but in fact it is responsible for applying indentation. Restore the line.
* | | | Merge branch 'clang-format-attrs' into releaseBrad King2017-02-229-44/+60
|\ \ \ \
| * | | | clang-format.bash: Use Git attributes to mark files for formattingBrad King2017-02-229-32/+27
| | | | |
| * | | | Define a custom Git attribute to mark sources using our C styleBrad King2017-02-221-5/+15
| | | | |
| * | | | Define a custom Git attribute to mark source files as generatedBrad King2017-02-222-10/+21
| | | | |
* | | | | Merge branch 'doc-cmake-language-makefile-vars' into releaseBrad King2017-02-221-0/+6
|\ \ \ \ \
| * | | | | Help: Clarify 'make-style' variable references in cmake-language(7)Michael Maltese2017-02-221-0/+6
| | |/ / / | |/| | | | | | | | | | | | | Fixes: #16661
* | | | | Merge branch 'FindCUDA-fix-init' into releaseBrad King2017-02-221-0/+1
|\ \ \ \ \
| * | | | | FindCUDA: Fix PTX selection with multiple architecturesBjoern Thiel2017-02-221-0/+1
| |/ / / /
* | | | | Merge branch 'vs2017-fallback-sdk' into releaseBrad King2017-02-212-0/+38
|\ \ \ \ \
| * | | | | VS2017: If Win 8.1 SDK is not available, use Win 10 SDKBrad King2017-02-212-0/+38
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We try to choose the Windows SDK version based on the version of Windows targeted by the build. However, if using VS 2017 without the Windows 8.1 SDK installed then we must fall back to the Windows 10 SDK even when targeting an older version of Windows. Inspired-by: gnaggnoyil <gnaggnoyil@gmail.com>
* | | | | Merge branch 'ExternalProject-update-docs' into releaseBrad King2017-02-211-2/+9
|\ \ \ \ \
| * | | | | ExternalProject: Clarify documented role of `INSTALL_DIR`Brad King2017-02-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does not actually configure the project to install to the given location. That must be done by passing the `<INSTALL_DIR>` placeholder to the external project configuration step.
| * | | | | ExternalProject: Clarify documented role of `INSTALL_COMMAND`Wilfried Goesgens2017-02-211-1/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | It is for the install step of the external project and does not affect installation of the calling project.
* | | | | Merge branch 'cuda-separable-bool' into releaseBrad King2017-02-212-2/+4
|\ \ \ \ \
| * | | | | CUDA: Fix boolean interpretation of CUDA_SEPARABLE_COMPILATIONBrad King2017-02-202-2/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | If the property is explicitly set to a non-true value we should not treat it as true.
* | | | | Merge branch 'FindGTK2-old-sigc++' into releaseBrad King2017-02-211-1/+4
|\ \ \ \ \
| * | | | | FindGTK2: handle old libsigc++ versionsBen Boeckel2017-02-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old versions of `libsigc++` do not have the version macros inside of its `sigc++config.h` header. Assume nothing about such headers and report version "zero". Fixes: #16654
* | | | | | Merge branch 'fix-CMP0017-path-case' into releaseBrad King2017-02-171-1/+1
|\ \ \ \ \ \
| * | | | | | Windows: Fix inconsistent behavior on changes to case of path to cmakeBrad King2017-02-171-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.4.0-rc1~333^2 (Merge branch 'upstream-kwsys' into update-kwsys, 2015-07-15) we brought in upstream KWSys commit 86a24794 (SystemTools: Fix GetActualCaseForPath drive letter case handling, 2015-07-09). This caused our path processing to convert drive letters to upper-case and exposed an existing bug in our implementation of CMP0017. Policy CMP0017 is responsible for ensuring that modules included from a builtin module only load other builtin modules and cannot be overridden by a file in `CMAKE_MODULE_PATH`. If there is a case difference in the drive letter (or other path components) then the path to the including module may not match our builtin module directory in a simple string comparison. This means builtin modules may not be recognized as such, and they may not reliably include their builtin dependencies. For example, if a project provides a `Platform/Windows` module in `CMAKE_MODULE_PATH` it can break inclusion of our builtin `Platform/Windows` module, leading to strange behavior. Fix this by comparing the path to the including module to our builtin module directory using a function that is aware of case-insensitivity of paths on Windows. Fixes: #16648, #16622
* | | | | | Merge branch 'FindHDF5-fix-header-langs' into releaseBrad King2017-02-171-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | FindHDF5: Fix search for language-specific header fileBrad King2017-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.6.0-rc1~85^2 (HDF5: Refactor the use of compiler wrappers, 2016-04-04) converted code of the form if(${LANGUAGE} MATCHES ...) to if(LANGUAGE MATCHES ...) However, `LANGUAGE` is a foreach() loop variable and not a normal variable so auto-dereference does not occur. Restore the explicit `${}` syntax and use the new name of the loop variable that has changed since then too. Fixes: #16651
generated by cgit v0.12 at 2025-01-06 15:01:45 (GMT)