summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindMPI: Make tests valid C89 by returning 0Christian Pfeiffer2019-05-062-0/+2
|
* FindMPI: Correct documentaiton for library versionChristian Pfeiffer2019-05-061-1/+1
|
* FindMPI: Add error loggingChristian Pfeiffer2019-05-061-16/+27
|
* Merge branch 'release-3.14'Brad King2019-05-060-0/+0
|\
| * Merge branch 'FindPython-fix-Python_RUNTIME_LIBRARY_DIRS-variable' into ↵Brad King2019-05-061-3/+6
| |\ | | | | | | | | | | | | | | | release-3.14 Merge-request: !3287
| * \ Merge branch 'fix_ios_try_compile' into release-3.14Brad King2019-05-061-1/+8
| |\ \ | | | | | | | | | | | | Merge-request: !3272
* | \ \ Merge topic 'FindPython-fix-Python_RUNTIME_LIBRARY_DIRS-variable'Brad King2019-05-061-3/+6
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 34c0293532 FindPython: ensure variable Python_RUNTIME_LIBRARY_DIRS is set correctly Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3287
| * | | FindPython: ensure variable Python_RUNTIME_LIBRARY_DIRS is set correctlyMarc Chevrier2019-05-051-3/+6
| |/ /
* | | Merge topic 'fix_ios_try_compile'Brad King2019-05-061-1/+8
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 275b6b3194 iOS: Fix try_compile FILE_COPY not to fail Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3272
| * | iOS: Fix try_compile FILE_COPY not to failAlexandru Croitor2019-05-061-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building for iOS, the compiled target is placed into a bundle. If a single-configuration generator is used, like Makefiles or Ninja, the try_compile FILE_COPY behavior fails to find the bundle, because it only looks for the bundle inside a Debug subfolder (presumably to support a multi-configuration generator like Xcode). Consider looking for the bundle in the root try_compile folder, as well as in the location specified by CMAKE_TRY_COMPILE_CONFIGURATION. Closes: #19211
* | | Merge topic 'SWIG'Brad King2019-05-064-1/+62
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e3919bae17 UseSWIG: Manage alternate library name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3241
| * | | UseSWIG: Manage alternate library nameMarc Chevrier2019-05-034-1/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manage alternate library name by passing -interface <library_name> for python language or -dllimport <library_name> for CSharp language to the SWIG compiler. Fixes: #18771
* | | | Merge topic 'findice-clang-cl'Brad King2019-05-061-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 541f079bd7 FindIce: Support clang-cl by checking CMAKE_CXX_SIMULATE_ID Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3284
| * | | | FindIce: Support clang-cl by checking CMAKE_CXX_SIMULATE_IDjspam2019-05-031-2/+2
| | | | | | | | | | | | | | | This applies commit d48bf97f, which does the same for FindBoost, to FindIce.
* | | | | CMake Nightly Date StampKitware Robot2019-05-061-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2019-05-051-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2019-05-041-1/+1
| |/ / / |/| | |
* | | | Merge topic 'std-pipes-always'Brad King2019-05-038-2/+77
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c85524a94a Ensure stdin, stdout, and stderr pipes are always open Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !3282
| * | | | Ensure stdin, stdout, and stderr pipes are always openBrad King2019-05-028-2/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On non-Windows platforms libuv assumes that file descriptors 0-2 are always used for standard pipes and never for anything else. Otherwise, libuv may re-use one of these descriptors and then fail an assertion when closing it. Similarly, On Windows platforms our ConsoleBuf implementation assumes that the standard handles are always open. If CMake is run with any standard pipes closed, open them with `/dev/null` or `NUL` to satisfy these assumptions. Fixes: #19219
* | | | | Merge topic 'cpack-ifw-stylesheet'Brad King2019-05-034-0/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c474fb2777 CPack/IFW: Add StyleSheet field Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3270
| * | | | | CPack/IFW: Add StyleSheet fieldZaytsev Yuriy2019-05-024-0/+30
| | | | | |
* | | | | | Merge topic 'jobs-positive-value'Brad King2019-05-0311-3/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ad699358b cmake: --build -j <jobs> should not accept 0. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3255
| * | | | | | cmake: --build -j <jobs> should not accept 0.Fred Baksik2019-05-0111-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #19059
* | | | | | | Merge topic 'DetermineCompilerId-versioned-llvm-for-vs'Brad King2019-05-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c846dbf89e CMakeDetermineCompilerId: Support versioned LLVM for Visual Studio. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3281
| * | | | | | | CMakeDetermineCompilerId: Support versioned LLVM for Visual Studio.Zufu Liu2019-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Supports versioned LLVM toolsets like LLVM_v142, LLVM_v141, LLVM_v141_xp, etc. for Visual Studio (2010 and later). The name for versioned LLVM toolsets has "LLVM_" prefix plus MSVC toolset name (i.e. v142, v141, v141_xp, etc.). Fixes: #19203
* | | | | | | | Merge topic 'genex-TARGET_FILE_BASE_NAME-manage-postfix'Brad King2019-05-037-20/+121
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e5ccabe9b Genex: Update $<TARGET_FILE_BASE_NAME:...>: take care of POSTFIX 1f4c9aa7d2 Refactor: introduce method cmGeneratorTarget::GetFilePostfix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3267
| * | | | | | | | Genex: Update $<TARGET_FILE_BASE_NAME:...>: take care of POSTFIXMarc Chevrier2019-05-025-8/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This capability complement MR !3190 and !3207 and is also needed to solve issue #18771.
| * | | | | | | | Refactor: introduce method cmGeneratorTarget::GetFilePostfixMarc Chevrier2019-05-022-12/+21
| | | | | | | | |
* | | | | | | | | Merge topic 'memorize_cxx_compilers_with_full_CXX14_support'Brad King2019-05-033-0/+16
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3dbec53255 CompileFeatures: Record when compilers gained full CXX14 support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3280
| * | | | | | | | CompileFeatures: Record when compilers gained full CXX14 supportRobert Maynard2019-05-023-0/+16
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the infrastructure added by commit 646fb1a646 (CompileFeatures: memoize C++ compilers with full language level support, 2019-03-27) to avoid using a `try_compile` to check for C++14 feature support when the running compiler is known to have all features.
* | | | | | | | CMake Nightly Date StampKitware Robot2019-05-031-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge topic 'ios_fixes'Brad King2019-05-021-4/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4783b842ba iOS: Only set the CMAKE_FIND_ROOT_PATH_MODE_* variables when not defined 5f5e3062cf iOS: Only look for packages in the provided CMAKE_FIND_ROOT_PATHs 94c5fa5f7a iOS: Allow setting multiple CMAKE_FIND_ROOT_PATH values 1011350694 iOS: Allow specifying CMAKE_MACOSX_BUNDLE in toolchain file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3273
| * | | | | | | iOS: Only set the CMAKE_FIND_ROOT_PATH_MODE_* variables when not definedAlexandru Croitor2019-04-301-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows overriding them in a toolchain file.
| * | | | | | | iOS: Only look for packages in the provided CMAKE_FIND_ROOT_PATHsAlexandru Croitor2019-04-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both CMAKE_FIND_ROOT_PATH_MODE_INCLUDE and CMAKE_FIND_ROOT_PATH_MODE_LIBRARY are set to "ONLY" when cross building to iOS, but appears that CMAKE_FIND_ROOT_PATH_MODE_PACKAGE was overlooked. This causes packages to be searched for in the host system as well, which is incorrect and can lead to linking issues. Set CMAKE_FIND_ROOT_PATH_MODE_PACKAGE to "ONLY" as well. CMAKE_FIND_ROOT_PATH_MODE_PROGRAM is not touched, because a user might want to find programs / tools on the host system.
| * | | | | | | iOS: Allow setting multiple CMAKE_FIND_ROOT_PATH valuesAlexandru Croitor2019-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the value is hardcoded to contain only the sysroot for the respective darwin platform. This means that it can not be changed in a custom toolchain file. Instead of overriding the value, simply append it. This is similar to how it is done in the Google provided Android toolchain file. The usecase is to allow specifying addiitonal roots to look for 3rd party packages which are definitely not present in the default sysroot.
| * | | | | | | iOS: Allow specifying CMAKE_MACOSX_BUNDLE in toolchain fileAlexandru Croitor2019-04-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently CMAKE_MACOSX_BUNDLE is always set to true when compiling for iOS. This poses a problem when using the source file variant of try_compile. Even if a custom value is passed via the CMAKE_FLAGS option, it would still be overridden by the Darwin.cmake file. Only set the value in case no other value was provided before.
* | | | | | | | Merge topic 'cpackrpm.debug'Brad King2019-05-021-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9beea0cca CPackRPM: Hide CPACK_RPM_ROOTDIR debug if not CPACK_RPM_PACKAGE_DEBUG Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3271
| * | | | | | | | CPackRPM: Hide CPACK_RPM_ROOTDIR debug if not CPACK_RPM_PACKAGE_DEBUGHarry Mallon2019-04-301-1/+3
| |/ / / / / / /
* | | | | | | | Merge topic 'genex-code-cleanup'Brad King2019-05-021-416/+175
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d856eba16 cmGeneratorExpressionNode: refactor TargetPropertyNode 9e1df5df54 cmGeneratorExpressionNode: use ctor arguments instead of macro 36f36d6a49 cmGeneratorExpressionNode: add VersionNode 3f57787dff cmGeneratorExpressionNode: remove structs CompilerId*, CompilerVersion* 20d7c5631e cmGeneratorExpressionNode: add CharacterNode abd62201bd cmGeneratorExpressionNode: simplify code in EqualNode f2c8ff8259 cmGeneratorExpressionNode: Simplify static string constant Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3234
| * | | | | | | | cmGeneratorExpressionNode: refactor TargetPropertyNodeLeonid Pospelov2019-04-221-48/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-order logic to improve readability and de-duplicate conditions. Factor out error message generation into a helper.
| * | | | | | | | cmGeneratorExpressionNode: use ctor arguments instead of macroLeonid Pospelov2019-04-221-30/+36
| | | | | | | | |
| * | | | | | | | cmGeneratorExpressionNode: add VersionNodeLeonid Pospelov2019-04-221-84/+10
| | | | | | | | |
| * | | | | | | | cmGeneratorExpressionNode: remove structs CompilerId*, CompilerVersion*Leonid Pospelov2019-04-221-166/+43
| | | | | | | | |
| * | | | | | | | cmGeneratorExpressionNode: add CharacterNodeLeonid Pospelov2019-04-221-36/+8
| | | | | | | | |
| * | | | | | | | cmGeneratorExpressionNode: simplify code in EqualNodeLeonid Pospelov2019-04-221-54/+29
| | | | | | | | |
| * | | | | | | | cmGeneratorExpressionNode: Simplify static string constantBrad King2019-04-221-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use our `""_s` user-defined literal to avoid initializing a static std::string.
* | | | | | | | | Merge topic 'code-cleanup-3'Brad King2019-05-021-29/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75643755a1 cmGlobalVisualStudioGenerator: remove redundant variables 615fb2633c cmGlobalVisualStudioGenerator: use cmJoin to join the filenames 30c98db61b cmGlobalVisualStudioGenerator: use auto instead of iterator types Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3257
| * | | | | | | | | cmGlobalVisualStudioGenerator: remove redundant variablesLeonid Pospelov2019-04-241-12/+5
| | | | | | | | | |
| * | | | | | | | | cmGlobalVisualStudioGenerator: use cmJoin to join the filenamesLeonid Pospelov2019-04-221-11/+1
| | | | | | | | | |
| * | | | | | | | | cmGlobalVisualStudioGenerator: use auto instead of iterator typesLeonid Pospelov2019-04-221-6/+5
| | |_|_|_|/ / / / | |/| | | | | | |