diff options
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/command/add_custom_command.rst | 10 | ||||
| -rw-r--r-- | Help/command/string.rst | 2 | ||||
| -rw-r--r-- | Help/manual/cmake-qt.7.rst | 18 | ||||
| -rw-r--r-- | Help/prop_test/PROCESSORS.rst | 9 | ||||
| -rw-r--r-- | Help/release/dev/FindEXPAT-importedtargets.rst | 4 | ||||
| -rw-r--r-- | Help/release/dev/FindFreetype-importedtargets.rst | 4 | ||||
| -rw-r--r-- | Help/release/dev/msvc-arm64.rst | 5 | ||||
| -rw-r--r-- | Help/release/dev/timestamp.rst | 5 |
8 files changed, 55 insertions, 2 deletions
diff --git a/Help/command/add_custom_command.rst b/Help/command/add_custom_command.rst index d038406..1b0aa14 100644 --- a/Help/command/add_custom_command.rst +++ b/Help/command/add_custom_command.rst @@ -225,3 +225,13 @@ of the following is specified: :command:`add_custom_target` command. ``POST_BUILD`` Run after all other rules within the target have been executed. + +.. note:: + Because generator expressions can be used in custom commands, + it is possible to define ``COMMAND`` lines or whole custom commands + which evaluate to empty strings for certain configurations. + For **Visual Studio 2010 (and newer)** generators these command + lines or custom commands will be omitted for the specific + configuration and no "empty-string-command" will be added. + + This allows to add individual build events for every configuration. diff --git a/Help/command/string.rst b/Help/command/string.rst index ba4a412..fb3893f 100644 --- a/Help/command/string.rst +++ b/Help/command/string.rst @@ -324,6 +324,7 @@ specifiers: %j The day of the current year (001-366). %m The month of the current year (01-12). %b Abbreviated month name (e.g. Oct). + %B Full month name (e.g. October). %M The minute of the current hour (00-59). %s Seconds since midnight (UTC) 1-Jan-1970 (UNIX time). %S The second of the current minute. @@ -331,6 +332,7 @@ specifiers: %U The week number of the current year (00-53). %w The day of the current week. 0 is Sunday. (0-6) %a Abbreviated weekday name (e.g. Fri). + %A Full weekday name (e.g. Friday). %y The last two digits of the current year (00-99) %Y The current year. diff --git a/Help/manual/cmake-qt.7.rst b/Help/manual/cmake-qt.7.rst index 55121df..7052e0a 100644 --- a/Help/manual/cmake-qt.7.rst +++ b/Help/manual/cmake-qt.7.rst @@ -214,6 +214,24 @@ overrides options from the :prop_tgt:`AUTORCC_OPTIONS` target property. Source files can be excluded from :prop_tgt:`AUTORCC` processing by enabling :prop_sf:`SKIP_AUTORCC` or the broader :prop_sf:`SKIP_AUTOGEN`. +Visual Studio Generators +======================== + +When using the :manual:`Visual Studio generators <cmake-generators(7)>` +CMake tries to use a ``PRE_BUILD`` +:command:`custom command <add_custom_command>` instead +of a :command:`custom target <add_custom_target>` for autogen. +``PRE_BUILD`` can't be used when the autogen target depends on files. +This happens when + +- :prop_tgt:`AUTOMOC` or :prop_tgt:`AUTOUIC` is enabled and the origin target + depends on :prop_sf:`GENERATED` files which aren't excluded from autogen by + :prop_sf:`SKIP_AUTOMOC`, :prop_sf:`SKIP_AUTOUIC`, :prop_sf:`SKIP_AUTOGEN` + or :policy:`CMP0071` +- :prop_tgt:`AUTORCC` is enabled and a ``.qrc`` file is listed in + the origin target sources +- :prop_tgt:`AUTOGEN_TARGET_DEPENDS` lists a source file + qtmain.lib on Windows ===================== diff --git a/Help/prop_test/PROCESSORS.rst b/Help/prop_test/PROCESSORS.rst index 763b6d0..a1211fb 100644 --- a/Help/prop_test/PROCESSORS.rst +++ b/Help/prop_test/PROCESSORS.rst @@ -1,8 +1,13 @@ PROCESSORS ---------- -How many process slots this test requires +Set to specify how many process slots this test requires. Denotes the number of processors that this test will require. This is typically used for MPI tests, and should be used in conjunction with -the ctest_test PARALLEL_LEVEL option. +the :command:`ctest_test` ``PARALLEL_LEVEL`` option. + +This will also be used to display a weighted test timing result in label and +subproject summaries in the command line output of :manual:`ctest(1)`. The wall +clock time for the test run will be multiplied by this property to give a +better idea of how much cpu resource CTest allocated for the test. diff --git a/Help/release/dev/FindEXPAT-importedtargets.rst b/Help/release/dev/FindEXPAT-importedtargets.rst new file mode 100644 index 0000000..ea73551 --- /dev/null +++ b/Help/release/dev/FindEXPAT-importedtargets.rst @@ -0,0 +1,4 @@ +FindEXPAT-importedtargets +------------------------- + +* The :module:`FindEXPAT` module now provides imported targets. diff --git a/Help/release/dev/FindFreetype-importedtargets.rst b/Help/release/dev/FindFreetype-importedtargets.rst new file mode 100644 index 0000000..a895883 --- /dev/null +++ b/Help/release/dev/FindFreetype-importedtargets.rst @@ -0,0 +1,4 @@ +FindFreetype-importedtargets +---------------------------- + +* The :module:`FindFreetype` module now provides imported targets. diff --git a/Help/release/dev/msvc-arm64.rst b/Help/release/dev/msvc-arm64.rst new file mode 100644 index 0000000..c8fadd4 --- /dev/null +++ b/Help/release/dev/msvc-arm64.rst @@ -0,0 +1,5 @@ +msvc-arm64 +---------- + +* Support for the MSVC ARM64 architecture was added. + Visual Studio 2017 Update 4 and above offer an ARM64 toolchain. diff --git a/Help/release/dev/timestamp.rst b/Help/release/dev/timestamp.rst new file mode 100644 index 0000000..e40009e --- /dev/null +++ b/Help/release/dev/timestamp.rst @@ -0,0 +1,5 @@ +timestamp +--------- + +* The :command:`string(TIMESTAMP)` command now supports ``%A`` + for full weekday name and ``%B`` for full month name. |