summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Android: Fix support for CMAKE_SYSROOT without CMAKE_SYSROOT_COMPILEBrad King2017-08-031-3/+9
| | | | | | | | | If `CMAKE_SYSROOT` is set by the user (e.g. via the toolchain file) then we do not set `CMAKE_SYSROOT_COMPILE` to our default. Fix our references to the sysroot's `/usr/include` directory to use `CMAKE_SYSROOT_COMPILE` only if it is set and else `CMAKE_SYSROOT`. Fixes: #17096
* Merge branch 'ninja_cuda_export_compile_commands_support' into release-3.9Brad King2017-07-131-1/+3
|\
| * CUDA: CMAKE_EXPORT_COMPILE_COMMANDS now works with CUDA and NinjaRobert Maynard2017-07-131-1/+3
| | | | | | | | Fixes: #17061
* | Android: Always add standard include directories lastBrad King2017-07-131-1/+0
|/ | | | | | | | | | | | | | | | | | | | | | | | | | The logic added in commit v3.6.0-rc1~30^2 (Add a variable to specify language-wide system include directories, 2016-05-24) to use `CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES` incorrectly filters them by `CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES`. Rather than recognizing this, commit v3.8.0-rc1~60^2 (Android: Pass sysroot include directory explicitly, 2017-01-20) worked around the problem by incorrectly removing `/usr/include` from `CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES` so it worked in `CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES`. By not filtering out `/usr/include` from user-specified include directories, we allow the code include_directories(${CMAKE_SYSROOT}/usr/include) to place the include directory too early on the command line. Fix support for standard include directories to not be filtered by implicit include directories, and do not remove `/usr/include` from the list of implicit include directories for Android builds. Add a test case to verify that an explicit `/usr/include` is ignored in favor of the standard directory at the end. Fixes: #17059
* Merge branch 'android-fix-c++_shared' into release-3.9Brad King2017-07-121-0/+1
|\
| * Android: Link to android_support with c++_sharedBrad King2017-07-121-0/+1
| | | | | | | | | | The NDK has done this in `build/core/definitions.mk` since r13 (r12 and below do so only for c++_static).
* | FindDoxygen: Create DOXYGEN_OUTPUT_DIRECTORY if it doesn't existRobert Dailey2017-07-061-3/+11
| | | | | | | | | | If the doxygen output directory does not exist, create it prior to running the doxygen commands.
* | FindDoxygen: Use a stable reference to the location of global resourcesRobert Dailey2017-06-291-5/+5
|/ | | | | | | | | | | | | FindDoxygen generates some files based on the version of Doxygen whose content will not vary across a project and are therefore a global resource that can be shared by all calls to `find_package(Doxygen)` and to `doxygen_add_docs`. We currently use `${PROJECT_BINARY_DIR}` to reference their location, but this is not stable because `project()` calls in a subdirectory can change it. Use `${CMAKE_BINARY_DIR}` instead. Reviewed-by: Craig Scott <craig.scott@crascit.com> Fixes: #17022
* Merge branch 'FindDoxygen-internal-var' into release-3.9Brad King2017-06-271-6/+6
|\
| * FindDoxygen: Add private prefix to internal variablesBrad King2017-06-271-6/+6
| | | | | | | | | | | | Since commit v3.9.0-rc1~55^2 (Improve Doxygen support, 2017-04-10) we accidentally leave a non-prefixed internal `result` variable set. This may interfere with project code. Add a prefix to avoid this.
* | Merge branch 'GetPrerequisites-ucrt-no-warn' into release-3.9Brad King2017-06-261-1/+1
|\ \
| * | GetPrerequisites: Do not warn about non-absolute UCRT system librariesBrad King2017-06-261-1/+1
| | | | | | | | | | | | Issue: #17007
* | | GCC,Clang: Mark CMAKE_<LANG>_COMPILER_{AR,RANLIB} as advancedBrad King2017-06-222-0/+4
|/ /
* | Merge branch 'android-unified-headers' into release-3.9Brad King2017-06-221-2/+6
|\ \
| * | Android: Fix include path for unified headersBrad King2017-06-221-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.9.0-rc3~3^2 (Android: Add support for unified headers, 2017-06-12) we accidentally constructed the unified header include directories from the linking sysroot. Construct them from the compiling sysroot instead. Fixes: #16584
* | | Merge branch 'ipo-per-lang' into release-3.9Brad King2017-06-145-19/+21
|\ \ \
| * | | IPO: Consider support for each language separatelyBrad King2017-06-145-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only define `INTERPROCEDURAL_OPTIMIZATION` behavior for C, CXX, and Fortran languages. Do not try to enable support for other languages. Furthermore, each language builds with a different compiler, so check for support by CMake and the compiler for each language independently. Fixes: #16944
* | | | Merge branch 'cuda-dlink-no-deprecated-gpu' into release-3.9Brad King2017-06-132-4/+21
|\ \ \ \
| * | | | CUDA: When linking device code suppress CUDA 8.0+ deprecation warningsRobert Maynard2017-06-132-4/+21
| |/ / / | | | | | | | | | | | | | | | | | | | | The CUDA compiler automatic deprecation warnings are pure noise when doing device linking, and should be suppressed to reduce the amount of confusion from users.
* | | | Merge branch 'doc-pkgconfig-list' into release-3.9Brad King2017-06-121-1/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | FindPkgConfig: mention that variables will be ;-listsRolf Eike Beer2017-06-121-0/+6
| | | |
| * | | FindPkgConfig: fix confusing indentationRolf Eike Beer2017-06-121-1/+1
| | | |
* | | | Android: Add support for unified headersBrad King2017-06-124-16/+52
|/ / / | | | | | | | | | | | | | | | | | | | | | The unified headers are preferred as of NDK r15, so use them by default if available and provide an option to use the deprecated headers. Inspired-by: Florent Castelli <florent.castelli@gmail.com> Fixes: #16584
* | | Merge branch 'android-standalone-no-sysroot-include' into release-3.9Brad King2017-06-091-2/+7
|\ \ \
| * | | Android: Do not pass sysroot include for standalone toolchainBrad King2017-06-091-2/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.8.0-rc1~60^2 (Android: Pass sysroot include directory explicitly, 2017-01-20) does not make sense when compiling with a standalone toolchain which is tied to a single API version. Drop the explicit include directory so that the compiler uses its default system include order. Fixes: #16954
* | | Merge branch 'android-standalone-unified-api-level' into release-3.9Brad King2017-06-091-5/+28
|\ \ \ | |_|/ |/| |
| * | Android: Detect API version of standalone toolchain with unified headersBrad King2017-06-091-5/+28
| |/ | | | | | | | | | | | | A standalone toolchain with unified headers keeps the `__ANDROID_API__` macro in the `bin/clang` launcher instead of in `api-level.h`. Issue: #16954
* | FindDoxygen: Create imported targets at most once in a given scopeBrad King2017-06-091-16/+24
| | | | | | | | | | | | The imported targets added by commit v3.9.0-rc1~55^2 (Improve Doxygen support, 2017-04-10) need to be guarded against duplicate creation on multiple inclusion.
* | FindDoxygen: Restore DOXYGEN_DOT_FOUND variableKonstantin Podsvirov2017-06-071-1/+1
|/ | | | | | The changes in commit v3.9.0-rc1~55^2 (Improve Doxygen support, 2017-04-10) accidentally dropped this variable from its compatibility mode.
* Merge topic 'GoogleTest-disabled-tests'Brad King2017-06-051-8/+38
|\ | | | | | | | | | | | | | | 92bbb706 GoogleTest: Add support for disabled tests Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Craig Scott <craig.scott@crascit.com> Merge-request: !920
| * GoogleTest: Add support for disabled testsChuck Atkins2017-06-051-8/+38
| | | | | | | | Fixes: #10612
* | Merge topic 'add-common-record-features-macros'Brad King2017-06-0112-179/+55
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c1ecb52 Intel: Fix missing C std default for 12.0 <= ver < 12.1 f70b0bb3 SunPro: Make sure all known versions get CXX98 defaults 220ede74 GNU: Fix language defaults for 3.4 a40e6ba8 Clang: Fix language defaults for 2.1 9b112a84 Compilers: Port to use default cmake_record_lang_compile_features macros 37221529 MSVC: Add empty definitions for std compile options e556f1b9 CompileFeatures: Makes tests work with meta-feature only 20ffa147 Tests: Allow test macro to take no executable arguments ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !833
| * | Intel: Fix missing C std default for 12.0 <= ver < 12.1Chuck Atkins2017-05-311-1/+1
| | |
| * | SunPro: Make sure all known versions get CXX98 defaultsChuck Atkins2017-05-311-3/+3
| | |
| * | GNU: Fix language defaults for 3.4Chuck Atkins2017-05-301-1/+1
| | |
| * | Clang: Fix language defaults for 2.1Chuck Atkins2017-05-301-1/+1
| | |
| * | Compilers: Port to use default cmake_record_lang_compile_features macrosChuck Atkins2017-05-3011-171/+2
| | |
| * | MSVC: Add empty definitions for std compile optionsChuck Atkins2017-05-291-2/+16
| | | | | | | | | | | | | | | | | | There are no specific options for MSVC to set language standards, but set them as empty strings anyways so the feature test infrastructure can at least check to see if they are defined.
| * | Compilers: Add default cmake_record_{c,cxx}_compile_features macrosChuck Atkins2017-05-291-0/+31
| | | | | | | | | | | | | | | | | | Add default implementations for the cmake_record_lang_compile_features macros. All implementations of this are the same so it can be safely factored out to a common implementation.
* | | FindGSL: recognize libraries name with debug postfix as debug librariesSilvio Traversaro2017-05-311-5/+6
|/ / | | | | | | | | | | This modification is necessary if the GSL libraries are installed in an installation layout without Release and Debug subdirectories, for example when installed by vcpkg .
* | Merge topic 'sunpro-std-flags'Brad King2017-05-281-2/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 370d0d25 SunPro: update flags used for CMake itself f1f21e30 SunPro: set -library=stlport as standard compile option for C++98 9316120c SunPro: add standard compile option for C++03 783fbb77 Tests: Compile entire Plugin test with the same language standard Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !879
| * | SunPro: set -library=stlport as standard compile option for C++98Daniel Pfeifer2017-05-261-0/+4
| | |
| * | SunPro: add standard compile option for C++03Daniel Pfeifer2017-05-261-2/+2
| | |
* | | Merge topic 'intel-std-flags'Brad King2017-05-282-36/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fc51b92c Intel: avoid variables in language standard flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !894
| * | | Intel: avoid variables in language standard flagsDaniel Pfeifer2017-05-262-36/+44
| | | | | | | | | | | | | | | | | | | | | | | | In the bootstrap script, we want to be able to extract language standard flags using sed. Make sure the content of the flag varianbles can be passed unmodified to the compiler.
* | | | Merge topic 'FindBoost-use-IN_LIST'Brad King2017-05-281-6/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc329a01 FindBoost: Simplify search in lists. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !750
| * | | | FindBoost: Simplify search in lists.Alex Turbov2017-05-261-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of `list(FIND...)` and then checking result for `-1` (found/not-found), nowadays `if` command has the `IN_LIST` test for that.
* | | | | Merge topic 'autogen_config'Brad King2017-05-281-3/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e3e692ca Autogen: Test adaptions dbda5906 Autogen: Per-config file suffixes. New AUTOGEN_BUILD_DIR target property. 0965002e Autogen: Pass build directory in Info file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !858
| * | | | | Autogen: Per-config file suffixes. New AUTOGEN_BUILD_DIR target property.Sebastian Holtermann2017-05-261-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #14760 Closes #14313
| * | | | | Autogen: Pass build directory in Info fileSebastian Holtermann2017-05-261-0/+1
| | |/ / / | |/| | |
generated by cgit v0.12 at 2024-09-23 14:40:41 (GMT)