summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Cray: clean up CrayPrgEnv and CrayLinuxEnvironment modulesChuck Cranor2019-02-192-81/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CrayPrgEnv: - add a new function __cmake_craype_linktype() that determines what link mode the Cray compiler wrapper will use in a more sophisticated way than just MATCHing for static/dynamic on the command line. - add a new function __cmake_craype_setupenv() that does a once-per-cmake-run setup that does the following: 1. does a basic check of the wrapper's configuration. Running cmake and then changing module and/or linktype configuration may cause build problems (since the data in the cmake cache may no longer be correct after the change). We look for this and warn the user about it. 2. uses the "module" provided PKG_CONFIG_PATH environment variable to add additional prefixes to the system prefix path. This function used to be done by CrayLinuxEnvironment using the compiler implicit include/link paths but that is intended only for cross-compiling on Cray front-end nodes. Since CrayPrgEnv runs on both front-end and compute nodes, we migrate this function here. CrayLinuxEnvironment: - No need to set variables like CMAKE_SHARED_LIBRARY_PREFIX to values that have already been properly established by CMakeGenericSystem.cmake. Remove redundant sets of CMAKE_SHARED_LIBRARY_PREFIX, CMAKE_SHARED_LIBRARY_SUFFIX, CMAKE_STATIC_LIBRARY_PREFIX, CMAKE_STATIC_LIBRARY_SUFFIX, CMAKE_FIND_LIBRARY_PREFIXES, and CMAKE_DL_LIBS. - No need to add $ENV{SYSROOT_DIR}/usr/include to CMAKE_SYSTEM_INCLUDE_PATH when we already added $ENV{SYSROOT_DIR}/usr to CMAKE_SYSTEM_PREFIX_PATH. - Remove __cray_list_intersect(), __list_clean_dupes(), and buggy code that adds compiler implicit includes/libs to CMAKE_SYSTEM_INCLUDE_PATH and CMAKE_SYSTEM_LIBRARY_PATH. This function has migrated to CrayPrgEnv.cmake, as noted above. See discussion in issue #17413 for additional details.
* Merge branch 'release-3.14'Brad King2019-02-190-0/+0
|\
| * Merge branch 'fix-legacy-implicit-includes' into release-3.14Brad King2019-02-193-37/+44
| |\ | | | | | | | | | Merge-request: !2981
| * \ Merge branch 'FindBoost-layout-tagged' into release-3.14Brad King2019-02-191-0/+8
| |\ \ | | | | | | | | | | | | Merge-request: !2961
* | \ \ Merge topic 'modernize-for-loops-c-arrays'Brad King2019-02-196-76/+80
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 706b93fa55 Modernize: C-arrays and loops over them Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2951
| * | | | Modernize: C-arrays and loops over themArtur Ryt2019-02-156-76/+80
| | | | | | | | | | | | | | | | | | | | | | | | | It replaces C arrays with deduced std::initializer_lists or std::array what makes enables for-loop over them.
* | | | | Merge topic 'readme-msys2'Craig Scott2019-02-191-3/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55ad9304ed README: Explain how to bootstrap via MSYS2 on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Bartosz <gang65@poczta.onet.pl> Merge-request: !2983
| * | | | | README: Explain how to bootstrap via MSYS2 on WindowsBrad King2019-02-191-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | Inspired-by: Bartosz Kosiorek <bartosz.kosiorek@tomtom.com>
* | | | | | Merge topic 'fix-legacy-implicit-includes'Brad King2019-02-193-37/+44
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 890bae524c Do not explicitly report "standard" include directories as implicit 5c171ca898 Restore unconditional use of "standard" include directories 9502276f82 Prefix implicit include directories with sysroot on construction Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2981
| * | | | | Do not explicitly report "standard" include directories as implicitBrad King2019-02-182-20/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 1293ed8507 (ParseImplicitIncludeInfo: keep implicit incl. consistent when rerunning cmake, 2019-01-30, v3.14.0-rc1~26^2) we did not account for `CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES`. This variable lets platform modules or toolchain files specify directories that are to be explicitly passed as standard include directories. These include directories are used by the test project from which we extract implicit include directories so they appear in the parsed results whether or not the compiler really considers them implicit. Exclude these entries from the computed implicit include directories since they are not actually implied by the compiler when we invoke it with "standard" include directories passed explicitly. Instead teach the build system generators to treat the "standard" directories as implicit for purposes of excluding them from appearing earlier in the compiler command line due to `include_directories` and `target_include_directories` calls. Issue: #18936, #18944
| * | | | | Restore unconditional use of "standard" include directoriesBrad King2019-02-181-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES` is meant to unconditionally add explicitly specified include directories to compile lines. In commit 5f34bdc7f9 (cmLocalGenerator: Refactor `GetIncludeDirectoriesImplicit` method, 2019-01-25, v3.14.0-rc1~65^2~1) a condition was accidentally added to exclude implicit include directories. Drop that condition. Fixes: #18936
| * | | | | Prefix implicit include directories with sysroot on constructionBrad King2019-02-182-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 7cd65c97fa (Add CMAKE_SYSROOT variable to set --sysroot when cross compiling., 2013-04-13, v3.0.0-rc1~342^2) we have prefixed the value of `CMAKE_SYSROOT` to implicit include directories. This was done because we hard-coded `/usr/include` as an implicit include directory without accounting for the sysroot. Instead we should prefix the hard-coded paths when they are constructed. Update the `Platform/UnixPaths` module to do this as `Platform/Darwin` already does. Since commit 5990ecb741 (Compute implicit include directories from compiler output, 2018-12-07, v3.14.0-rc1~108^2) the values of the `CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES` variables are computed from a real compiler invocation so they already account for the sysroot prefix. In commit 6fc3382944 (Update logic for sysroot in detected implicit include directories, 2019-02-13, v3.14.0-rc2~6^2) we attempted to apply the prefix conditionally, but that is incorrect because the compiler's real implicit include directories are not all under the sysroot. Instead assume that all implicit include directories in `CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES` already have the sysroot prefix if needed. Code that constructs the value must be responsible for that because it is the only place that knows.
* | | | | | Merge topic 'FindBoost-layout-tagged'Brad King2019-02-191-0/+8
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | bee6597ac5 FindBoost: Find boost libraries built with --layout=tagged Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2961
| * | | | | FindBoost: Find boost libraries built with --layout=taggedYves Frederix2019-02-181-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pick up libraries of the form `boost_system-mt-x64`, which do not have the version suffix. Fixes: #18908
* | | | | | CMake Nightly Date StampKitware Robot2019-02-191-1/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'release-3.14'Brad King2019-02-180-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'file_symlink_docs' into release-3.14Brad King2019-02-181-23/+23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2974
* | \ \ \ \ Merge topic 'file_symlink_docs'Brad King2019-02-181-23/+23
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f5a9f7934 Help: Clarify and improve readability of link-related file subcommands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2974
| * | | | | Help: Clarify and improve readability of link-related file subcommandsCraig Scott2019-02-161-23/+23
| | |/ / / | |/| | |
* | | | | Merge topic 'require-xcode-5'Brad King2019-02-188-165/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afb325018e Xcode: Require at least Xcode 5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2975
| * | | | | Xcode: Require at least Xcode 5Gregor Jasny2019-02-168-165/+19
| | | | | |
* | | | | | Merge branch 'release-3.14'Brad King2019-02-180-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'externalproject_docs' into release-3.14Brad King2019-02-182-2/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2978
| * \ \ \ \ \ Merge branch 'get_filename_component_docs' into release-3.14Brad King2019-02-181-4/+3
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | Merge-request: !2973
* | | | | | | Merge topic 'get_filename_component_docs'Brad King2019-02-181-4/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2cc145928c Help: Remove outdated statement about get_filename_component() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2973
| * | | | | | Help: Remove outdated statement about get_filename_component()Craig Scott2019-02-161-4/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After !2853, the statement that the "longest file extension is always considered" is no longer true. Both NAME_WLE and LAST_EXT now return details based on the shortest file extension. Fixes: 7a25ef326b (Help: Add documentation for new get_filename_component components, 2019-01-24, 3.14.0-rc1)
* | | | | | Merge topic 'externalproject_docs'Brad King2019-02-182-2/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2072a6554 Help: Clarify ExternalProject_Add()'s LOG_MERGED_STDOUTERR behavior f2820bce15 Release notes: Make ExternalProject dot points consistent Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2978
| * | | | | Help: Clarify ExternalProject_Add()'s LOG_MERGED_STDOUTERR behaviorCraig Scott2019-02-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The output is only merged for a step if it is logging to file. This option is ignored for steps that are logging normally. A minor grammatical error has also been fixed as part of this change.
| * | | | | Release notes: Make ExternalProject dot points consistentCraig Scott2019-02-171-1/+1
| |/ / / / | | | | | | | | | | Use same phrasing and command linking.
* | | | | Merge topic 'delete_copy_assign'Brad King2019-02-1835-1/+126
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae5e97a005 Delete some default constructors and assignment operators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2968
| * | | | | Delete some default constructors and assignment operatorsAlbert Astals Cid2019-02-1535-1/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are unused, but if someone used them they would lead to problems since they would copy the internal raw pointers and the destructor would cause double delete
* | | | | | Merge topic 'autogen_test_fix'Brad King2019-02-181-11/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91344e7a46 Autogen: Fix RerunMocPlugin test for Ninja generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2971
| * | | | | | Autogen: Fix RerunMocPlugin test for Ninja generatorSebastian Holtermann2019-02-151-11/+4
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2019-02-181-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2019-02-171-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2019-02-161-1/+1
| | | | | |
* | | | | | Merge topic 'systools-cleanup'Brad King2019-02-155-24/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd20cc29a2 cmSystemTools: Remove redundant cmCopyFile() and Split() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2966
| * | | | | | cmSystemTools: Remove redundant cmCopyFile() and Split()Vitaly Stakhovsky2019-02-155-24/+3
| | | | | | |
* | | | | | | Merge topic 'remove_return_void'Kyle Edwards2019-02-151-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30faf72625 Remove return from void function Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2969
| * | | | | | | Remove return from void functionAlbert Astals Cid2019-02-141-3/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'ninja-swift-library-name'Brad King2019-02-153-0/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 157570b5a2 Add placeholder for Swift's library name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2902
| * | | | | | | Add placeholder for Swift's library nameSaleem Abdulrasool2019-02-133-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to set the proper link name for the Swift library (soname). Because this needs to be passed to the object being compiled, we need to create a new placeholder so that it can be sent along to the frontend. Default to the target name unless it is explicitly provided.
* | | | | | | | Merge topic 'update-kwsys'Brad King2019-02-152-12/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f510aafbfc Merge branch 'upstream-KWSys' into update-kwsys a930de85d8 KWSys 2019-02-14 (e270ce9f) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2967
| * | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-02-142-12/+4
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2019-02-14 (e270ce9f)
| | * | | | | | KWSys 2019-02-14 (e270ce9f)KWSys Upstream2019-02-142-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit e270ce9fc60971006e934e9d53d11be5f85efc39 (master). Upstream Shortlog ----------------- Albert Astals Cid (2): 95ced423 hashtable: delete assignment operator instead of poisoning it 6090d36b Glob: Use the default copy constructor and assignment operator
* | | | | | | | Merge branch 'release-3.14'Brad King2019-02-150-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | CMake 3.14.0-rc2v3.14.0-rc2Brad King2019-02-151-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'tests-intel-fixup'Brad King2019-02-151-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8fc0c98f08 Tests: Fix Module.WriteCompilerDetectionHeader for Intel on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2963
| * | | | | | | | Tests: Fix Module.WriteCompilerDetectionHeader for Intel on WindowsBrad King2019-02-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a condition added by commit 091afa7342 (Tests: Teach tests when to treat clang-cl as MSVC, 2018-11-06) to be specific to Clang.
* | | | | | | | | Merge branch 'release-3.14'Brad King2019-02-150-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
generated by cgit v0.12 at 2025-03-13 19:26:30 (GMT)