summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \
| * | QtAutogen: Do not re-generate AUTORCC outputs on every buildBrad King2016-11-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'pkgconfig_imported_target' into releaseBrad King2016-11-081-1/+1
|\ \ \ | |/ / |/| |
| * | PkgConfig: Fix FindPkgConfig imported target featureFlorent Castelli2016-11-041-1/+1
|/ / | | | | | | | | | | | | 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.
* | CMake 3.7.0-rc3v3.7.0-rc3Brad King2016-11-041-1/+1
| |
* | Merge branch 'cpackifw-search-algorithm' into releaseBrad King2016-11-031-21/+47
|\ \
| * | CPackIFW: Update search to find QtIFW distributed with QtSDKKonstantin Podsvirov2016-11-031-21/+47
| | | | | | | | | | | | Also avoid CMP0007 warnings.
* | | Merge branch 'FindHDF5-restore-default-C' into releaseBrad King2016-11-021-10/+2
|\ \ \
| * | | FindHDF5: Restore pre-3.6 behavior of finding only C by defaultBrad King2016-11-021-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.6.0-rc1~72^2 (HDF5: Rework component searching to correctly find HL for all bindings, 2016-05-12) changed the default behavior from finding only the C bindings to finding everything for the enabled languages. Restore the original behavior for compatibility and because many projects need only the C bindings. Closes: #16397
* | | | Merge branch 'doc-cmake-qt-fixes' into releaseBrad King2016-11-021-1/+1
|\ \ \ \
| * | | | Help: Update example Qt 5 find_package call to add missing componentThiago M. de C. Marques2016-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running CMake on it caused the following error: error: Target "publisher" links to target "Qt5::DBus" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? Add the missing DBus component.
| * | | | Help: Update example Qt 5 find_package call to use COMPONENTSMarcus D. Hanwell2016-11-021-1/+1
| | |/ / | |/| |
* | | | Merge branch 'cpack-doc-typos' into releaseBrad King2016-11-022-7/+7
|\ \ \ \
| * | | | CPackRPM: Fix incorrect variable name in documentationAlex Turbov2016-11-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `CPACK_RPM_COMPONENT_INSTALL` is the correct variable to set to enable component packaging. `CPACK_RPM_PACKAGE_COMPONENT` is just set to a component name when CPack calls corresponding installer.
| * | | | CPackDeb: Fix incorrect variable name in documentationAlex Turbov2016-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `CPACK_DEB_COMPONENT_INSTALL` is the correct variable to set to enable component packaging. `CPACK_DEB_PACKAGE_COMPONENT` is just set to a component name when CPack calls corresponding installer.
| * | | | CPackDeb: fix copy-n-paste typos in documentationAlex Turbov2016-11-011-3/+3
| |/ / /
* | | | Merge branch 'fix-macos-sysroot' into releaseBrad King2016-11-022-30/+2
|\ \ \ \
| * | | | Darwin: Remove deployment target version checkGregor Jasny2016-11-012-26/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with Xcode 8 the SDK folder also contains an unversioned entry: MacOSX.sdk MacOSX10.12.sdk -> MacOSX.sdk If this unversioned path is used CMake cannot detect the SDK version. Furthermore, querying the SDK version via xcodebuild -sdk <sysroot> -version Path gives bogus results for the Command Line Tools installed into `/`. The OS X deployment target version and SDK version are not as tied as they once were, so this check is now more trouble than it is worth. Simply remove it. Closes: #16323
| * | | | Revert "Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path"Gregor Jasny2016-11-011-4/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.7.0-rc1~48^2 (Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path, 2016-09-25). The replacement of `else()` with `if(CMAKE_OSX_SYSROOT)` defeats the prior handling of `if("x${CMAKE_OSX_SYSROOT}" MATCHES "/")`. This causes the combination -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="" -DCMAKE_OSX_SYSROOT:STRING=/ to not be honored and `-isysroot` to be emitted as a compiler flag universally. We will need another solution to the problem the now-reverted commit was meant to address. Closes: #16394
* | | | Merge branch 'FindMatlab-fix-typo' into releaseBrad King2016-10-282-3/+3
|\ \ \ \
| * | | | FindMatlab: Fix typo in matlab_add_unit_test implementationMatthew Woehlke2016-10-282-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in variable used to communicate between matlab_add_unit_test and its helper script MatlabTestsRedirect.cmake that was introduced in commit v3.7.0-rc1~116^2 (FindMatlab: Extend matlab_add_unit_test to run arbitrary test code, 2016-08-30).
* | | | Merge branch 'FindMatlab-9.1' into releaseBrad King2016-10-281-0/+1
|\ \ \ \
| * | | | FindMatlab: Add support for Matlab 2016b (9.1)Francesco Romano2016-10-281-0/+1
| |/ / /
* | | | Merge branch 'cmake-server-handshake-improvements' into releaseBrad King2016-10-284-66/+104
|\ \ \ \
| * | | | server-mode: Handle generator toolset and platform in handshakeTobias Hunger2016-10-283-2/+35
| | | | |