summaryrefslogtreecommitdiff
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'FindBoost-1.63' into releaseBrad King2017-01-101-1/+16
|\
| * FindBoost: Add support for 1.63Roger Leigh2017-01-101-1/+16
| |
* | 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.
* FindBoost: Add support for VS 2017Vic Luo2016-12-081-2/+6
|
* Merge branch 'backport-android-info-variables' into releaseBrad King2016-11-183-2/+29
|\
| * Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINEBrad King2016-11-183-0/+11
| | | | | | | | | | | | | | | | 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-183-0/+4
| | | | | | | | | | | | | | | | | | 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-183-2/+14
| | | | | | | | | | | | | | | | | | 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
* | 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
* 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.
* 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 'FindHDF5-fix-hl-fortran' into releaseBrad King2016-09-021-1/+1
| |\ \
| * \ \ Merge branch 'FindHDF5-is-parallel' into releaseBrad King2016-09-021-8/+60
| |\ \ \
| * \ \ \ Merge branch 'GetPrerequisites-fix-regression' into releaseBrad King2016-08-121-2/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'update-cle-version-info' into releaseBrad King2016-08-082-4/+14
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'intel-gnu11-support' into releaseBrad King2016-08-031-4/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fix-findhdf5-definitions' into releaseBrad King2016-08-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 'intel-17-features' into releaseBrad King2016-10-261-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Features: Record features for Intel C++ 17 on UNIXBrad King2016-10-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #16384
* | | | | | | | | | Merge branch 'intel-compile-features-windows' into releaseBrad King2016-10-242-6/+12
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Intel: Fix compiler extension flags on WindowsBrad King2016-10-242-6/+12
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The extension flags enabled by commit v3.6.0-rc1~120^2~1 (Features: Record standard flags for Intel C/C++ on Windows, 2016-04-18) of the form `-Qstd=gnu++11` are not supported by the Intel C/C++ Compiler for Windows. Fall back to using the non-extension form of the flags. Issue: #16384
* | | | | | | | | Android: Link position-independent executables with proper flagsBrad King2016-10-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `-fPIE -pie` to the default executable link flags when `CMAKE_POSITION_INDEPENDENT_CODE` is enabled. This is required by Android 16 and above for executables to run on the device. Closes: #16382
* | | | | | | | | Android: Set CMAKE_POSITION_INDEPENDENT_CODE automaticallyBrad King2016-10-2415-35/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the toolchain file or cache does not set this, enable it automatically based on the Android API version. Versions 16 and above expect position independent code. Use the main `CMAKE_POSITION_INDEPENDENT_CODE` setting in favor of hard-coding `-fpic` or `-fPIC` in the compiler flags for each ABI. This allows CMake to use `-fpie` or `-fPIE` as needed when sources are meant for executables, and `-fpic` or `-fPIC` for other sources.
* | | | | | | | | Android: Add missing link flags for device executablesBrad King2016-10-214-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See `${ndk}/build/core/default-build-commands.mk` for link flags the NDK uses for executables. Add them to our default executable link flags. Suppress `nocopyreloc` on `arm64-v8a` because it does not work with some STL types. Closes: #16380
* | | | | | | | | Android: Fix support for armeabi with c++_staticBrad King2016-10-211-0/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing "unwind" and "atomic" libraries needed for this combination. See `${ndk}/sources/cxx-stl/llvm-libc++/libs/armeabi/libc++.a` for the libraries the NDK uses. Issue: #16380
* | | | | | | | Merge branch 'fix-Android-NsightTegra' into releaseBrad King2016-10-181-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | VS: Fix NVIDIA Nsight Tegra Visual Studio Edition supportBrad King2016-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The guard added by commit v3.7.0-rc1~229^2~17 (Android: Suppress new functionality with Nsight Tegra in VS IDE builds, 2016-06-02) to `Modules/Platform/Android-Determine.cmake` does not work in that location because `CMAKE_VS_PLATFORM_NAME` is not set until after the module is loaded. Change this particular guard to test for the Visual Studio generator instead. If in the future we add support for using Visual Studio for Android without Nsight Tegra then something more will be needed, but this is good enough for now. Closes: #16371
* | | | | | | | | Merge branch 'external-project-source-subdir-usage' into releaseBrad King2016-10-181-8/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ExternalProject: make SOURCE_SUBDIR directly appendableBen Boeckel2016-10-181-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows it to be used in expansions without being conditional based on its value.
| * | | | | | | | | ExternalProject: error out only if the property is unsetBen Boeckel2016-10-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Property values may be empty; instead make sure they exist and allow for empty values.
* | | | | | | | | | Merge branch 'FindwxWidgets-unversioned-library-path' into releaseBrad King2016-10-171-12/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | FindwxWidgets: Fix finding unversioned VS-built directory prefixesBrad King2016-10-171-12/+22
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.7.0-rc1~217^2 (FindwxWidgets: Add VS-versioned library directory prefixes, 2016-08-24) works only for official wxWidgets builds that add the VS-versioned directory prefixes. Local wxWidgets builds still have an unversioned prefix. Search them. Closes: #16366
* | | | | | | | | | Merge branch 'osx-no-deployment-target-on-cross-compile' into releaseBrad King2016-10-171-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | OS X: Do not try to set deployment target when cross-compilingGregor Jasny2016-10-171-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.4.0-rc2~6^2 (Xcode: Adjust deployment target SDK version to host version, 2015-10-11) does not make sense when cross-compiling. Make it conditional to fix this regression in some cross-compiling cases. Closes: #16355