summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'print-sources'Brad King2022-06-0716-27/+184
|\ | | | | | | | | | | | | | | | | | | | | | | | | d8dcfa7776 Tests: Add tests for CMakePrintHelpers b7ddfcfe08 cmake_print_properties(): Update grammar docs e52b9e1270 PrintHelpers: Document argument order restriction d87ed4d88f PrintHelpers: Fix indentation 5fa70e1738 PrintHelpers: Rewrite a few more error messages 2579503f45 PrintHelpers: Fix target SOURCES property Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7331
| * Tests: Add tests for CMakePrintHelpersFeRD (Frank Dana)2022-06-0615-0/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add three tests in Tests/RunCMake/PrintHelpers, meant to verify basic functionality of the module. Tests are: * Variables: Test the results of a cmake_print_variables() call on two variables set within the test script. * Properties: Test cmake_print_properties() calls on a pair of SOURCES and a pair of TARGETS, printing some basic properties. * PropertiesSources: Specifically verify the results of a cmake_print_properties() call for the SOURCES property of a TARGET. Prior to the fix introduced alongside these tests, it was a known bug that such a request caused a FATAL_ERROR.
| * cmake_print_properties(): Update grammar docsFeRD (Frank Dana)2022-06-061-6/+6
| |
| * PrintHelpers: Document argument order restrictionFeRD (Frank Dana)2022-06-061-1/+4
| |
| * PrintHelpers: Fix indentationFeRD (Frank Dana)2022-06-061-2/+2
| |
| * PrintHelpers: Rewrite a few more error messagesFeRD (Frank Dana)2022-06-061-2/+3
| |
| * PrintHelpers: Fix target SOURCES propertyFeRD (Frank Dana)2022-06-061-16/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's been a long-standing bug in CMakePrintHelpers that the cmake_print_properties() function cannot print the SOURCES property of a requested TARGET, confusing it with a request to print properties of SOURCES. We work around this by parsing the arguments in two stages, so that a SOURCES that comes after the PROPERTIES keyword is handled differently from a SOURCES that comes before it. This adds the restriction that the "mode" keyword (TARGETS SOURCES DIRECTORIES etc...) and its arguments **must** precede the PROPERTIES keyword and its arguments. In other words: 1. Both of these are now valid and will be interpreted correctly, whereas previously only the first was, and the second caused a FATAL_ERROR: cmake_print_properties(SOURCES foo.c PROPERTIES LANGUAGE) cmake_print_properties(TARGETS foo PROPERTIES SOURCES) 2. This, OTOH, which used to be valid, no longer is, and will trigger a FATAL_ERROR: cmake_print_properties(PROPERTIES LANGUAGE SOURCES foo.c) Fixes: #14883
* | Merge topic 'FindPython-interpreter-search-strategy'Brad King2022-06-071-2/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | 8de50bae84 FindPython*: enhance interpreter lookup Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7330
| * | FindPython*: enhance interpreter lookupMarc Chevrier2022-06-051-2/+11
| |/ | | | | | | Fixes: #23588
* | Merge topic 'tests-java-compiler-var'Brad King2022-06-071-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | fdeb237934 Tests: Use Java_JAVAC_EXECUTABLE variable consistently Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7327
| * | Tests: Use Java_JAVAC_EXECUTABLE variable consistentlyCraig Scott2022-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain specific scenarios, it is possible to end up with JAVA_COMPILE being unset, but Java_JAVAC_EXECUTABLE being set. This typically occurs when running different versions of CMake in the same build directory without deleting the CMakeCache.txt each time. This can result in an obscure error about the wrong number of arguments to the get_filename_component() command, but the real cause is the JAVA_COMPILE variable being unset. The JAVA_COMPILE variable is only set by the FindJava module, and it is a legacy variable that has been superceded by Java_JAVAC_EXECUTABLE. The latter is what the if() expression tests, so use that same variable in the body of the if() block for consistency and to avoid the above problem.
* | | Merge topic 'ext_disabled'Brad King2022-06-071-5/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5014741c9 Tests/CompileFeatures: Fix CMP0128OldSameStandard with default OFF Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7328
| * | | Tests/CompileFeatures: Fix CMP0128OldSameStandard with default OFFRaul Tambre2022-06-041-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With CMP0128 OLD compiler extensions are enabled by default regardless of the compiler's default. Fix the test to always check for the extension flag as it was intended to. Fixes: 4a0485be7f4ab06201c478f5a46111ab1e8e773e (cmStandardLevelResolver: Avoid unnecessary flags, fix unset level logic, 2021-04-29)
* | | | CMake Nightly Date StampKitware Robot2022-06-071-1/+1
| | | |
* | | | Merge topic 'if-command-PATH_EQUAL'Brad King2022-06-0617-2/+156
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be4b9e10af if command: Add PATH_EQUAL operator Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7321
| * | | | if command: Add PATH_EQUAL operatorMarc Chevrier2022-06-0317-2/+156
| | | | |
* | | | | Merge topic 'c-no-extensions'Brad King2022-06-066-0/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c7c3e39e4f Utilities: Activate POSIX APIs even without compiler extensions 3ba324b6b6 libarchive: Remove a system preprocessor macro that conflicts with a local var 4a283fcc31 librhash: Explicitly enable large file support on 32-bit targets Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7320
| * | | | | Utilities: Activate POSIX APIs even without compiler extensionsBrad King2022-06-044-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile some third-party libraries with preprocessor definitions that activate POSIX APIs even when compiler extensions are not enabled. We already do this in libuv, inherited from the upstream buildsystem. This extends commit f034b0f663 (CMake compilation: do not use compiler extensions, 2020-03-14, v3.18.0-rc1~494^2). Issue: #20454
| * | | | | libarchive: Remove a system preprocessor macro that conflicts with a local varBrad King2022-06-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On SunOS i386, the system headers sometimes define macro names corresponding to register names, short and with no prefix. Undefine one that conflicts with our code.
| * | | | | librhash: Explicitly enable large file support on 32-bit targetsBrad King2022-06-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `_LARGEFILE_SOURCE` is needed at least on SunOS i386 if compiler extensions are not enabled.
* | | | | | Merge topic 'doc-find_package-formatting'Craig Scott2022-06-061-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afcf275cc9 Help: Fix formatting and missing cross-reference for find_package() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7329
| * | | | | | Help: Fix formatting and missing cross-reference for find_package()Craig Scott2022-06-051-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | Amends 42f7e39789 (Find: Support per call disabling of CMAKE_INSTALL_PREFIX, 2022-03-21)
* | | | | | CMake Nightly Date StampKitware Robot2022-06-061-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2022-06-051-1/+1
|/ / / /
* | | | Merge topic 'update-kwsys'Brad King2022-06-045-12/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1869f82823 Merge branch 'upstream-KWSys' into update-kwsys 6b88084658 KWSys 2022-06-03 (c28e27bc) Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7322
| * \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2022-06-035-12/+18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2022-06-03 (c28e27bc)
| | * | | | KWSys 2022-06-03 (c28e27bc)KWSys Upstream2022-06-035-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit c28e27bc4ad8e12d88b05f30eec19b2987c60721 (master). Upstream Shortlog ----------------- Brad King (3): 591c4efb Activate POSIX APIs even without compiler extensions 45f20b83 Fix XL/XLClang warning suppression under CMP0089 NEW behavior 257b1111 Configure with policies through CMake 3.22
* | | | | | Merge topic 'test-ExternalProject-fs-delay'Brad King2022-06-041-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e46e4ee96a Tests: Fix RunCMake.ExternalProject filesystem delay for Borland Makefiles Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7323
| * | | | | | Tests: Fix RunCMake.ExternalProject filesystem delay for Borland MakefilesBrad King2022-06-031-1/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our 1.125s delay does not seem to be long enough to be reliable with the Borland "make" tool. Use a longer delay for Borland and Watcom. Follow the pattern from commit 67040500ea (Tests: Fix RunCMake.BuildDepends filesystem delay for Borland Makefiles, 2015-09-25, v3.4.0-rc1~38^2).
* | | | | | Merge topic 'help-genex-updates'Brad King2022-06-041-19/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6427902713 Help: genex: layout updates Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7324
| * | | | | | Help: genex: layout updatesMarc Chevrier2022-06-031-19/+22
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * create section for version comparisons * move $<LINK_LIBRARY> and $<LINK_GROUP> to "Output-Related Expressions" section
* | | | | | Merge topic 'doc-add_custom_command-TARGET'Brad King2022-06-041-0/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8cf8f4d13b Help: State behavior for add_custom_command(TARGET) without event type Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7326
| * | | | | Help: State behavior for add_custom_command(TARGET) without event typeCraig Scott2022-06-041-0/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Projects should always have specified one of PRE_BUILD, PRE_LINK or POST_BUILD, and the documentation has always shown that one must be given. But the argument parsing logic was such that if none was given, POST_BUILD would be used and no error or warning would be raised. Projects may be relying on this behavior, so document it as formally supported, but not recommended. Fixes: #23488
* | | | | CMake Nightly Date StampKitware Robot2022-06-041-1/+1
|/ / / /
* | | | Merge branch 'release-3.23'Brad King2022-06-030-0/+0
|\ \ \ \
| * \ \ \ Merge topic 'ci-ninja-1.11.0' into release-3.23Brad King2022-06-035-9/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62689fcf9c ci: update to use ninja 1.11.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7319
* | \ \ \ \ Merge topic 'ci-ninja-1.11.0'Brad King2022-06-035-9/+9
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 62689fcf9c ci: update to use ninja 1.11.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7319
| * | | | | ci: update to use ninja 1.11.0Brad King2022-06-025-9/+9
| |/ / / /
* | | | | Merge topic 'genex-PATH_EQUAL'Brad King2022-06-0313-0/+129
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d1883df11 Genex-PATH_EQUAL: path comparison Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7309
| * | | | | Genex-PATH_EQUAL: path comparisonMarc Chevrier2022-06-0113-0/+129
| | | | | | | | | | | | | | | | | | | | | | | | To complete issue #23498
* | | | | | Merge topic 'FindOpenSSL3_applink'Brad King2022-06-031-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a6caef9d5 FindOpenSSL: Set version variables for version >= 3.0.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7305
| * | | | | | FindOpenSSL: Set version variables for version >= 3.0.0James Calo2022-06-021-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variables `OPENSSL_VERSION_MAJOR`, `OPENSSL_VERSION_MINOR` and `OPENSSL_VERSION_FIX` are now set to the correct values when using OpenSSL version >= 3.0.0, which uses a new format.
* | | | | | | Merge topic 'envmod'Brad King2022-06-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fcddb1cd5f FindEnvModules: BUGFIX: env_module_swap OUTPUT_VARIBLE Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7315
| * | | | | | | FindEnvModules: BUGFIX: env_module_swap OUTPUT_VARIBLEMichael Hirsch2022-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since originally added to CMake, env_module_swap(OUTPUT_VARIABLE) did not give output since the incorrect variable name was used.
* | | | | | | | Merge topic 'GNUInstallDirs-opt-homebrew'Brad King2022-06-031-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8de3983b4c GNUInstallDirs: Do not treat /opt/homebrew as under /opt Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7318
| * | | | | | | | GNUInstallDirs: Do not treat /opt/homebrew as under /optBrad King2022-06-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #23579
* | | | | | | | | Merge topic 'FetchContent-CMP0135'Brad King2022-06-036-14/+92
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c2044fdf3f FetchContent: Respect the CMP0135 policy setting Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7316
| * | | | | | | | FetchContent: Respect the CMP0135 policy settingCraig Scott2022-06-026-14/+92
| | |/ / / / / / | |/| | | | | | | | | | | | | | Fixes: #23560
* | | | | | | | CMake Nightly Date StampKitware Robot2022-06-031-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'doc-RULE_LAUNCH_COMPILE'Brad King2022-06-026-8/+44
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e281ba27b7 Help: Clarify that RULE_LAUNCH_COMPILE is meant for internal use Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7317