summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 'case-insensitive-bindir-detection' into releaseBrad King2017-01-201-1/+2
|\
| * cmSystemTools: use the actual case for root detectionBen Boeckel2017-01-181-1/+2
| | | | | | | | | | | | | | | | | | On Windows, calling a binary installed with the default `bin` binary directory will fail to be detected when called as `BIN\cmake.exe` due to the string compare. Get the actual case of the path before checking that the path ends with `CMAKE_BIN_DIR`. Fixes #16574.
* | CMake 3.7.2v3.7.2Brad King2017-01-131-1/+1
| |
* | Merge branch 'cmFileMonitor-skip-empty-names' into releaseBrad King2017-01-111-0/+3
|\ \
| * | cmake-server: Do not try watching subdirectories with empty namesAleix Pol2017-01-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | `cmsys::SystemTools::SplitPath` will return empty segments on paths where there's duplicaded consequent slashes (e.g. `/home/dir/my//stuff`). This makes the cmFileWatcher choke. Teach cmFileMonitor to skip these empty segments. Closes: #16531
* | | Merge branch 'FindBoost-1.63' into releaseBrad King2017-01-101-1/+16
|\ \ \
| * | | FindBoost: Add support for 1.63Roger Leigh2017-01-101-1/+16
| | | |
* | | | Merge branch 'pgsql-yum' into releaseBrad King2017-01-101-1/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | FindPostgreSQL: automatically find installations from yum.postgresql.orgRolf Eike Beer2017-01-101-1/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | In commit v3.3.0-rc1~4^2 (FindPostgreSQL: Search some more common packaging locations) the PostgreSQL_ADDITIONAL_SEARCH_PATHS variable was removed. This was used e.g. by osm2pgsql to be able to build on CentOS with recent PostgreSQL versions. At least add those locations from yum.postgresql.org, which is a more or less official location.
* | | Merge branch 'cmake-server-do-not-crash-on-interface-lib' into releaseBrad King2017-01-091-2/+6
|\ \ \
| * | | server-mode: Do not crash when running into INTERFACE_LIBRARYTobias Hunger2017-01-091-2/+6
| |/ / | | | | | | | | | Closes: #16539
* | | Merge branch 'mr-reset-error-flag-on-configure' into releaseBrad King2016-12-161-0/+2
|\ \ \ | |/ / |/| |
| * | server-mode: Call ResetErrorOccured before configureTobias Hunger2016-12-161-0/+2
|/ / | | | | | | Closes: #16506
* | Merge branch 'FindBoost-vs15' into releaseBrad King2016-12-081-2/+6
|\ \
| * | FindBoost: Add support for VS 2017Vic Luo2016-12-081-2/+6
| | |
* | | Merge branch 'vs-fix-standalone-Windows7.1SDK-toolset' into releaseBrad King2016-12-071-1/+10
|\ \ \
| * | | VS: Fix standalone Windows7.1SDK toolset selectionBrad King2016-12-071-1/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.7.0-rc1~142^2~1 (VS: Explicitly default to v100 toolset in Visual Studio 2010, 2016-07-21) we prefer to always set a platform toolset explicitly so that `CMAKE_VS_PLATFORM_TOOLSET` can be reported. However, the `v100` default for the VS 10 generator is not appropriate for all environments. We fixed support for VS 2010 Express Edition in commit v3.7.0-rc1~142^2 (VS: Do not default to missing v100 64-bit toolset on VS 2010 Express, 2016-09-09). Fix support for the standalone Windows7.1SDK toolset environment by recognizing the `PlatformToolset` environment variable that it sets to `Windows7.1SDK` and using this as our default toolset instead. Closes: #16483
* | | Merge branch 'vs-Zc-inline' into releaseBrad King2016-11-302-0/+3
|\ \ \
| * | | VS: Add v140 flag table entries for `-Zc:inline[-]`Brad King2016-11-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation of this option [1] claims that the default is off, but VS seems to use `-Zc:inline` by default if `RemoveUnreferencedCodeData` does not appear in the `.vcxproj` file. Add the flag table entry to allow use of the flag to be configured. [1] https://msdn.microsoft.com/en-us/library/dn642448.aspx Suggested-by: Serti Ayoub <ayb.serti@gmail.com>
| * | | VS: Add v141 flag table entry for `-Zc:inline-`Brad King2016-11-301-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The negative form of the `-Zc:inline` flag is missing from c:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/Common7/IDE/VC/VCTargets/1033/cl.xml so it was not included in our flag table automatically. Add it manually. Suggested-by: Serti Ayoub <ayb.serti@gmail.com>
* | | Merge branch 'cmake-server-pad-arguments' into releaseBrad King2016-11-301-1/+1
|\ \ \ | |/ / |/| |
| * | server-mode: Do not ignore the first cacheArgument on configureTobias Hunger2016-11-301-1/+1
|/ / | | | | | | | | SetCacheArgs skips the first argument it gets, so add some padding before calling it.
* | CMake 3.7.1v3.7.1Brad King2016-11-301-1/+1
| |
* | Merge branch 'vs15-rename-generator' into releaseBrad King2016-11-295-14/+17
|\ \
| * | VS: Rename VS 15 generator to 'Visual Studio 15 2017'Roman Wüger2016-11-295-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | The final name of this VS version was announced: https://blogs.msdn.microsoft.com/visualstudio/2016/11/16/visual-studio-2017-rc/ Add the year to the generator name accordingly. For convenience, map the name without the year to the name with the year.
* | | Merge branch 'libarchive-openssl-1.1' into releaseBrad King2016-11-289-41/+183
|\ \ \
| * | | libarchive: Add support for building with OpenSSL 1.1Brad King2016-11-286-38/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSSL 1.1 made some CTX structures opaque. Port our code to use the structures only through pointers via OpenSSL 1.1 APIs. Use our adaption layer to make this work with OpenSSL 1.0 and below. Patch-by: Tomas Mraz <tmraz@redhat.com> Patch-from: https://bugzilla.redhat.com/1383744
| * | | libarchive: Add headers to adapt between OpenSSL 1.1 and older versionsBrad King2016-11-286-3/+108
| | |/ | |/| | | | | | | | | | | | | | | | Add private forwarding headers for `openssl/{evp,hmac}.h` to give us a central place to add adaptation code to work across multiple incompatible OpenSSL versions. Provide compatibility implementations of some OpenSSL 1.1 APIs when using older OpenSSL versions.
* | | Merge branch '16449-revert-xcode-system-includes' into releaseBrad King2016-11-283-44/+19
|\ \ \
| * | | Revert "Xcode: Obey SYSTEM keyword for includes (#15687)"Gregor Jasny2016-11-283-44/+19
| |/ / | | | | | | | | | | | | | | | | | | | | | Revert commit v3.7.0-rc1~266^2 (Xcode: Obey SYSTEM keyword for includes, 2015-08-31). It worked for C, C++, and Swift but not for GNU Assembly files for which Xcode has no property to set flags. Closes: #16449
* | | Merge branch 'doc-CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT' into releaseBrad King2016-11-213-0/+17
|\ \ \ | |_|/ |/| |
| * | Help: Document CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT variableBrad King2016-11-213-0/+17
| |/ | | | | | | | | | | This variable documentation was simply missing. Suggested-by: Craig Scott <craig.scott@crascit.com>
* | Merge branch 'vs-15-preview-5' into releaseBrad King2016-11-182-2/+2
|\ \
| * | VS: Update VS 15 generator for Preview 5Brad King2016-10-062-2/+2
| | | | | | | | | | | | | | | | | | The `PlatformToolset` is now `v141` instead of `v140`. Closes: #16347
* | | Merge branch 'backport-android-info-variables' into releaseBrad King2016-11-1811-6/+87
|\ \ \
| * | | Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINEBrad King2016-11-188-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose the binutils' machine name (typically used as a prefix on the tool names) publicly. This is expected to match the `gcc -dumpmachine` value. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
| * | | Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variableBrad King2016-11-186-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NDK provides prebuilt toolchain files in directories named for the host architecture. The NDK build system calls this `HOST_TAG`. Expose the value publicly for use by clients that need to pass it to external tools. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
| * | | Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSIONBrad King2016-11-186-4/+26
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | When this variable is not set by the user or toolchain file, set it to the default selected. This will be useful for client code that needs to pass the value to an external tool that needs to find the same toolchain in the NDK. Leave it empty for a standalone toolchain. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
* | | Merge branch 'armcc-response-file-flag' into releaseBrad King2016-11-151-0/+1
|\ \ \
| * | | ARMCC: Fix flag used for response filesBen Boeckel2016-11-151-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | ARMCC does not use the `@` sigil to indicate response files, but instead the `--via=` flag. See the documentation here: http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0491h/CHDCIEGC.html Fixes: #16425
* | | Merge branch 'cmake-server-fix-16423' into releaseBrad King2016-11-142-28/+77
|\ \ \
| * | | server-mode: Reset GlobalGenerator before configureTobias Hunger2016-11-142-28/+77
| |/ / | | | | | | | | | | | | | | | | | | This is what cmake-gui also does to avoid CMake crashing on repeated attempts to configure it. Fixes #16423.
* | | Merge branch 'cmake-server-fix-16422' into releaseBrad King2016-11-141-1/+1
|\ \ \
| * | | server-mode: Prevent possible crash when watching directoriesTobias Hunger2016-11-141-1/+1
| |/ / | | | | | | | | | | | | | | | | | | The `filename` passed by libuv may be `nullptr`, so handle that explicitly. Fixes: #16422
* | | Merge branch 'FindBISON-fix-rebuild' into releaseBrad King2016-11-141-1/+1
|\ \ \ | |/ / |/| |
| * | FindBISON: Do not rebuild every time when not VERBOSEBrad King2016-11-141-1/+1
|/ / | | | | | | | | | | | | | | | | | | Since commit v3.7.0-rc1~348^2~3 (FindBISON: Change usage of [VERBOSE <file>] to [VERBOSE [<file>]], 2016-07-16) we always list the VERBOSE output file as an output of our custom command even if the option is not used. This causes the rule to re-run every time (e.g. with Ninja). Revert one hunk from that change (that looks incorrect) to fix it. Closes: #16426
* | CMake 3.7.0v3.7.0Brad King2016-11-111-1/+1
| |
* | Merge branch 'autorcc-only-no-rebuild' into releaseBrad King2016-11-091-2/+2
|\ \
generated by cgit v0.12 at 2025-01-25 06:26:30 (GMT)