Commit Graph

33321 Commits

Author SHA1 Message Date
Kolan Sh 528b19e505 Merge remote-tracking branch 'cmake/release' 2017-01-17 14:57:47 +03:00
Brad King 35413bf2c1 CMake 3.7.2 2017-01-13 08:58:58 -05:00
Brad King 0051989738 Merge branch 'cmFileMonitor-skip-empty-names' into release 2017-01-11 13:51:38 -05:00
Aleix Pol 7bad99b0d3 cmake-server: Do not try watching subdirectories with empty names
`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
2017-01-11 13:48:41 -05:00
Brad King e9d3557ccc Merge branch 'FindBoost-1.63' into release 2017-01-10 13:15:58 -05:00
Roger Leigh a9b93501d4 FindBoost: Add support for 1.63 2017-01-10 13:15:34 -05:00
Brad King c046356a5c Merge branch 'pgsql-yum' into release 2017-01-10 09:53:26 -05:00
Rolf Eike Beer 5ffee691ee FindPostgreSQL: automatically find installations from yum.postgresql.org
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.
2017-01-10 09:52:42 -05:00
Brad King 68d13665e0 Merge branch 'cmake-server-do-not-crash-on-interface-lib' into release 2017-01-09 16:33:02 -05:00
Tobias Hunger 33e628ee80 server-mode: Do not crash when running into INTERFACE_LIBRARY
Closes: #16539
2017-01-09 16:31:11 -05:00
Brad King 195ab50f63 Merge branch 'mr-reset-error-flag-on-configure' into release 2016-12-16 08:56:02 -05:00
Tobias Hunger 7789dd9a1a server-mode: Call ResetErrorOccured before configure
Closes: #16506
2016-12-16 08:54:37 -05:00
Brad King 12bea47fa4 Merge branch 'FindBoost-vs15' into release 2016-12-08 08:25:08 -05:00
Vic Luo c3b6b5babc FindBoost: Add support for VS 2017 2016-12-08 08:20:08 -05:00
Brad King f243a34cce Merge branch 'vs-fix-standalone-Windows7.1SDK-toolset' into release 2016-12-07 11:17:49 -05:00
Brad King 27431de162 VS: Fix standalone Windows7.1SDK toolset selection
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
2016-12-07 11:02:54 -05:00
Kolan Sh e237211a89 Merge remote-tracking branch 'cmake/release' 2016-12-07 17:06:26 +03:00
Brad King 0d89c1e87c Merge branch 'vs-Zc-inline' into release 2016-11-30 14:30:41 -05:00
Brad King 418afd5b2c VS: Add v140 flag table entries for `-Zc:inline[-]`
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>
2016-11-30 14:20:15 -05:00
Brad King 315d44f773 VS: Add v141 flag table entry for `-Zc:inline-`
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>
2016-11-30 14:04:02 -05:00
Brad King d69cf34708 Merge branch 'cmake-server-pad-arguments' into release 2016-11-30 13:14:52 -05:00
Tobias Hunger 28e891f0c7 server-mode: Do not ignore the first cacheArgument on configure
SetCacheArgs skips the first argument it gets, so add some padding before
calling it.
2016-11-30 13:14:15 -05:00
Brad King db3499df5d CMake 3.7.1 2016-11-30 09:54:05 -05:00
Brad King f75d936a04 Merge branch 'vs15-rename-generator' into release 2016-11-29 11:05:29 -05:00
Roman Wüger d639620e14 VS: Rename VS 15 generator to 'Visual Studio 15 2017'
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.
2016-11-29 10:46:36 -05:00
Brad King a04bbcde3d Merge branch 'libarchive-openssl-1.1' into release 2016-11-28 14:55:48 -05:00
Brad King 6f23daea43 libarchive: Add support for building with OpenSSL 1.1
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
2016-11-28 14:55:42 -05:00
Brad King 7d433206cf libarchive: Add headers to adapt between OpenSSL 1.1 and older versions
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.
2016-11-28 14:55:42 -05:00
Brad King ca7a52fc59 Merge branch '16449-revert-xcode-system-includes' into release 2016-11-28 13:57:56 -05:00
Gregor Jasny 543dcb0ada Revert "Xcode: Obey SYSTEM keyword for includes (#15687)"
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
2016-11-28 13:42:46 -05:00
Brad King 47dd761379 Merge branch 'doc-CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT' into release 2016-11-21 11:52:32 -05:00
Brad King df9fea7f49 Help: Document CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT variable
This variable documentation was simply missing.

Suggested-by: Craig Scott <craig.scott@crascit.com>
2016-11-21 11:52:00 -05:00
Brad King 37966a5799 Merge branch 'vs-15-preview-5' into release 2016-11-18 11:43:43 -05:00
Brad King 9fd9fd9861 Merge branch 'backport-android-info-variables' into release 2016-11-18 10:05:00 -05:00
Brad King ea8eba0bbf Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINE
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>
2016-11-18 10:03:15 -05:00
Brad King 0d3eb139e1 Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variable
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>
2016-11-18 10:03:07 -05:00
Brad King 236d6244a0 Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION
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>
2016-11-18 10:02:57 -05:00
Brad King 4cddb46e64 Merge branch 'armcc-response-file-flag' into release 2016-11-15 10:13:37 -05:00
Ben Boeckel d608e85cfe ARMCC: Fix flag used for response files
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
2016-11-15 09:31:33 -05:00
Brad King afb4a224be Merge branch 'cmake-server-fix-16423' into release 2016-11-14 11:24:56 -05:00
Tobias Hunger 516a2cd360 server-mode: Reset GlobalGenerator before configure
This is what cmake-gui also does to avoid CMake crashing on repeated
attempts to configure it.

Fixes #16423.
2016-11-14 11:06:37 -05:00
Brad King 04dce5f965 Merge branch 'cmake-server-fix-16422' into release 2016-11-14 10:19:12 -05:00
Tobias Hunger d0a707b3d0 server-mode: Prevent possible crash when watching directories
The `filename` passed by libuv may be `nullptr`, so handle that
explicitly.

Fixes: #16422
2016-11-14 10:18:44 -05:00
Brad King 7f0470cabc Merge branch 'FindBISON-fix-rebuild' into release 2016-11-14 10:14:13 -05:00
Brad King c087072e21 FindBISON: Do not rebuild every time when not VERBOSE
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
2016-11-14 10:06:48 -05:00
Brad King 5cfc2e926a CMake 3.7.0 2016-11-11 09:24:18 -05:00
Brad King dc083f9534 Merge branch 'autorcc-only-no-rebuild' into release 2016-11-09 11:26:04 -05:00
Brad King e4232b82e6 QtAutogen: Do not re-generate AUTORCC outputs on every build
Refactoring in commit v3.6.0-rc1~134^2~10 (Autogen: Split out moc file
generation code to dedicated method, 2016-04-18) removed the
unconditional creation of the `<target>_automoc.cpp` file.  Now it is
generated only when `AUTOMOC` is enabled.  However, if this file is not
created then our internal `GenerateAll` setting is enabled on every
build, causing `AUTORCC` to re-generate its file(s) every time.  Fix the
`GenerateAll` setting to be used only for when autogen settings change.
The old logic was left from when we had only automoc.

Closes: #16413
2016-11-09 11:22:07 -05:00
Brad King 51112aaa18 Merge branch 'pkgconfig_imported_target' into release 2016-11-08 09:48:33 -05:00
Florent Castelli 61898de641 PkgConfig: Fix FindPkgConfig imported target feature
The options to the find_library call to create the imported target
used a literal string "HINTS /path NO_DEFAULT_PATH" instead of a
list of options. This resulted in never finding any library in my
testing.
2016-11-04 23:35:27 +01:00