diff options
| -rw-r--r-- | Help/command/add_custom_command.rst | 3 | ||||
| -rw-r--r-- | Help/release/dev/add_custom_command-target-alias.rst | 5 | ||||
| -rw-r--r-- | Modules/CMakeDetermineSystem.cmake | 12 | ||||
| -rw-r--r-- | Modules/FindOpenACC.cmake | 1 | ||||
| -rw-r--r-- | Modules/Platform/Windows-Clang.cmake | 21 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 10 | ||||
| -rw-r--r-- | Source/cmSystemTools.cxx | 13 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | Tests/CMakeOnly/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/CustomCommand/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 23 | ||||
| -rw-r--r-- | Tests/UseSWIG/CMakeLists.txt | 1 |
13 files changed, 69 insertions, 48 deletions
diff --git a/Help/command/add_custom_command.rst b/Help/command/add_custom_command.rst index 2bb1390..5996d64 100644 --- a/Help/command/add_custom_command.rst +++ b/Help/command/add_custom_command.rst @@ -554,6 +554,9 @@ one of the keywords to make clear the behavior they expect. .. versionadded:: 3.21 Support for target-dependent generator expressions. +.. versionadded:: 3.29 + The ``<target>`` may be an :ref:`ALIAS target <Alias Targets>`. + Examples: Build Events ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/Help/release/dev/add_custom_command-target-alias.rst b/Help/release/dev/add_custom_command-target-alias.rst new file mode 100644 index 0000000..7646a53 --- /dev/null +++ b/Help/release/dev/add_custom_command-target-alias.rst @@ -0,0 +1,5 @@ +add_custom_command-target-alias +------------------------------- + +* The :ref:`add_custom_command(TARGET) <add_custom_command(TARGET)>` + signature now supports adding build events through :ref:`Alias Targets`. diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake index fff4e9d..1ccde43 100644 --- a/Modules/CMakeDetermineSystem.cmake +++ b/Modules/CMakeDetermineSystem.cmake @@ -177,22 +177,19 @@ if(CMAKE_TOOLCHAIN_FILE) endif() endif() - -# if CMAKE_SYSTEM_NAME is here already set, either it comes from a toolchain file -# or it was set via -DCMAKE_SYSTEM_NAME=... -# if that's the case, assume we are crosscompiling if(CMAKE_SYSTEM_NAME) + # CMAKE_SYSTEM_NAME was set by a toolchain file or on the command line. + # Assume it set CMAKE_SYSTEM_VERSION and CMAKE_SYSTEM_PROCESSOR too. if(NOT DEFINED CMAKE_CROSSCOMPILING) set(CMAKE_CROSSCOMPILING TRUE) endif() - set(PRESET_CMAKE_SYSTEM_NAME TRUE) elseif(CMAKE_VS_WINCE_VERSION) set(CMAKE_SYSTEM_NAME "WindowsCE") set(CMAKE_SYSTEM_VERSION "${CMAKE_VS_WINCE_VERSION}") set(CMAKE_SYSTEM_PROCESSOR "${MSVC_C_ARCHITECTURE_ID}") set(CMAKE_CROSSCOMPILING TRUE) - set(PRESET_CMAKE_SYSTEM_NAME TRUE) else() + # Build for the host platform and architecture by default. set(CMAKE_SYSTEM_NAME "${CMAKE_HOST_SYSTEM_NAME}") if(NOT DEFINED CMAKE_SYSTEM_VERSION) set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}") @@ -206,7 +203,6 @@ else() ) endif() set(CMAKE_CROSSCOMPILING FALSE) - set(PRESET_CMAKE_SYSTEM_NAME FALSE) endif() include(Platform/${CMAKE_SYSTEM_NAME}-Determine OPTIONAL) @@ -224,7 +220,7 @@ endif() # in this case there is no CMAKE_BINARY_DIR if(CMAKE_BINARY_DIR) # write entry to the log file - if(PRESET_CMAKE_SYSTEM_NAME) + if(CMAKE_CROSSCOMPILING) message(CONFIGURE_LOG "The target system is: ${CMAKE_SYSTEM_NAME} - ${CMAKE_SYSTEM_VERSION} - ${CMAKE_SYSTEM_PROCESSOR}\n" "The host system is: ${CMAKE_HOST_SYSTEM_NAME} - ${CMAKE_HOST_SYSTEM_VERSION} - ${CMAKE_HOST_SYSTEM_PROCESSOR}\n" diff --git a/Modules/FindOpenACC.cmake b/Modules/FindOpenACC.cmake index 436f5ea..e9ca683 100644 --- a/Modules/FindOpenACC.cmake +++ b/Modules/FindOpenACC.cmake @@ -147,6 +147,7 @@ function(_OPENACC_GET_FLAGS_CANDIDATE LANG FLAG_VAR) set(ACC_FLAG_PGI "-acc") set(ACC_FLAG_GNU "-fopenacc") set(ACC_FLAG_Cray "-h acc") + set(ACC_FLAG_Clang "-fopenacc") if(DEFINED ACC_FLAG_${CMAKE_${LANG}_COMPILER_ID}) set("${FLAG_VAR}" "${ACC_FLAG_${CMAKE_${LANG}_COMPILER_ID}}" PARENT_SCOPE) diff --git a/Modules/Platform/Windows-Clang.cmake b/Modules/Platform/Windows-Clang.cmake index db48150..b9e6394 100644 --- a/Modules/Platform/Windows-Clang.cmake +++ b/Modules/Platform/Windows-Clang.cmake @@ -167,37 +167,32 @@ macro(__enable_llvm_rc_preprocessing clang_option_prefix extra_pp_flags) endif() endmacro() -macro(__verify_same_language_values variable) - foreach(lang "C" "CXX" "HIP") - if(DEFINED CMAKE_${lang}_${variable}) - list(APPEND __LANGUAGE_VALUES_${variable} "${CMAKE_${lang}_${variable}}") - endif() +function(__verify_same_language_values variable langs) + foreach(lang IN LISTS langs) + list(APPEND __LANGUAGE_VALUES_${variable} ${CMAKE_${lang}_${variable}}) endforeach() list(REMOVE_DUPLICATES __LANGUAGE_VALUES_${variable}) list(LENGTH __LANGUAGE_VALUES_${variable} __NUM_VALUES) - if(__NUM_VALUES GREATER 1) message(FATAL_ERROR ${ARGN}) endif() - unset(__NUM_VALUES) - unset(__LANGUAGE_VALUES_${variable}) -endmacro() +endfunction() if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC" OR "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC" OR "x${CMAKE_CUDA_SIMULATE_ID}" STREQUAL "xMSVC" OR "x${CMAKE_HIP_SIMULATE_ID}" STREQUAL "xMSVC") - __verify_same_language_values(COMPILER_ID + __verify_same_language_values(COMPILER_ID "C;CXX;HIP" "The current configuration mixes Clang and MSVC or " "some other CL compatible compiler tool. This is not supported. " - "Use either Clang or MSVC as the compiler for all of C, C++, CUDA and/or HIP.") + "Use either Clang or MSVC as the compiler for all of C, C++, and/or HIP.") - __verify_same_language_values(COMPILER_FRONTEND_VARIANT + __verify_same_language_values(COMPILER_FRONTEND_VARIANT "C;CXX;CUDA;HIP" "The current configuration uses the Clang compiler " "tool with mixed frontend variants, both the GNU and in MSVC CL " "like variants. This is not supported. Use either clang/clang++ " - "or clang-cl as all C, C++, CUDA and/or HIP compilers.") + "or clang-cl as all C, C++, CUDA, and/or HIP compilers.") if(NOT CMAKE_RC_COMPILER_INIT) # Check if rc is already in the path diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 3715ec5..c34a2f0 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 28) -set(CMake_VERSION_PATCH 20240131) +set(CMake_VERSION_PATCH 20240202) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 2687afa..509f28b 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1144,9 +1144,15 @@ cmTarget* cmMakefile::GetCustomCommandTarget( const std::string& target, cmObjectLibraryCommands objLibCommands, const cmListFileBacktrace& lfbt) const { - // Find the target to which to add the custom command. - auto ti = this->Targets.find(target); + auto realTarget = target; + auto ai = this->AliasTargets.find(target); + if (ai != this->AliasTargets.end()) { + realTarget = ai->second; + } + + // Find the target to which to add the custom command. + auto ti = this->Targets.find(realTarget); if (ti == this->Targets.end()) { MessageType messageType = MessageType::AUTHOR_WARNING; bool issueMessage = false; diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 18ca85b..3b70543 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -3697,6 +3697,10 @@ cm::string_view cmSystemTools::GetSystemName() { #if defined(_WIN32) return "Windows"; +#elif defined(__MSYS__) + return "MSYS"; +#elif defined(__CYGWIN__) + return "CYGWIN"; #elif defined(__ANDROID__) return "Android"; #else @@ -3725,15 +3729,6 @@ cm::string_view cmSystemTools::GetSystemName() if (systemName.find("kFreeBSD") != cm::string_view::npos) { systemName = "kFreeBSD"; } - - // fix for CYGWIN and MSYS which have windows version in them - if (systemName.find("CYGWIN") != cm::string_view::npos) { - systemName = "CYGWIN"; - } - - if (systemName.find("MSYS") != cm::string_view::npos) { - systemName = "MSYS"; - } return systemName; } return ""; diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index a7a456c..1ee45d6 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -422,6 +422,7 @@ if(BUILD_TESTING) endif() if(CMAKE_Fortran_COMPILER) ADD_TEST_MACRO(FortranOnly FortranOnly) + set_property(TEST FortranOnly APPEND PROPERTY LABELS "Fortran") endif() # test Visual Studio GNU Fortran mixing with cmake_add_fortran_subdirectory # run this project if we have a working fortran compiler or @@ -455,6 +456,7 @@ if(BUILD_TESTING) endif() if(NOT CMAKE_SKIP_VSGNUFortran) ADD_TEST_MACRO(VSGNUFortran ${CMAKE_CMAKE_COMMAND} -P runtest.cmake) + set_property(TEST VSGNUFortran APPEND PROPERTY LABELS "Fortran") endif() endif() @@ -509,15 +511,18 @@ if(BUILD_TESTING) ADD_TEST_MACRO(PolicyScope PolicyScope) ADD_TEST_MACRO(EmptyLibrary EmptyLibrary) ADD_TEST_MACRO(CompileDefinitions CompileDefinitions) - if(CMAKE_Fortran_COMPILER) - set(CompileOptions_BUILD_OPTIONS -DTEST_FORTRAN=1) - endif() + if(_isMultiConfig) set(CompileOptions_CTEST_OPTIONS --build-config $<CONFIGURATION>) else() set(CompileOptions_BUILD_OPTIONS -DCMAKE_BUILD_TYPE=$<CONFIGURATION>) endif() + if(CMAKE_Fortran_COMPILER) + list(APPEND CompileOptions_BUILD_OPTIONS -DTEST_FORTRAN=1) + endif() ADD_TEST_MACRO(CompileOptions CompileOptions) + set_property(TEST CompileOptions APPEND PROPERTY LABELS "Fortran") + ADD_TEST_MACRO(CompatibleInterface CompatibleInterface) ADD_TEST_MACRO(AliasTarget AliasTarget) ADD_TEST_MACRO(StagingPrefix StagingPrefix) @@ -660,6 +665,7 @@ if(BUILD_TESTING) if(CMAKE_Fortran_COMPILER) set(Module.CheckIPOSupported-Fortran_BUILD_OPTIONS -DCMake_TEST_IPO_WORKS_Fortran=${CMake_TEST_IPO_WORKS_Fortran}) ADD_TEST_MACRO(Module.CheckIPOSupported-Fortran CheckIPOSupported-Fortran) + set_property(TEST Module.CheckIPOSupported-Fortran APPEND PROPERTY LABELS "Fortran") endif() add_test(Module.ExternalData ${CMAKE_CTEST_COMMAND} @@ -2160,7 +2166,7 @@ if(BUILD_TESTING) endif() ADD_TEST_MACRO(MSVCDebugInformationFormat) set_property(TEST MSVCDebugInformationFormat APPEND - PROPERTY LABELS "CUDA") + PROPERTY LABELS "CUDA" "Fortran") set(MSVCRuntimeLibrary_BUILD_OPTIONS -DCMake_TEST_CUDA=${CMake_TEST_CUDA}) ADD_TEST_MACRO(MSVCRuntimeLibrary) @@ -2168,6 +2174,7 @@ if(BUILD_TESTING) PROPERTY LABELS "CUDA") if(CMAKE_Fortran_COMPILER) ADD_TEST_MACRO(MSVCRuntimeLibrary.Fortran) + set_property(TEST MSVCRuntimeLibrary.Fortran APPEND PROPERTY LABELS "Fortran") endif() endif() if(MSVC OR @@ -3362,6 +3369,7 @@ if(BUILD_TESTING) --build-two-config --test-command testf) list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Fortran") + set_property(TEST Fortran APPEND PROPERTY LABELS "Fortran") if(CMAKE_Fortran_COMPILER_SUPPORTS_F90) add_test(FortranModules ${CMAKE_CTEST_COMMAND} @@ -3376,6 +3384,7 @@ if(BUILD_TESTING) ${CMake_TEST_FortranModules_BUILD_OPTIONS} ) list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/FortranModules") + set_property(TEST FortranModules APPEND PROPERTY LABELS "Fortran") endif() # FortranCInterface tests. @@ -3385,6 +3394,7 @@ if(BUILD_TESTING) add_test(FortranC.Flags ${CMAKE_CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/FortranC/Flags.cmake) list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/FortranC/Flags") + set_property(TEST FortranC.Flags APPEND PROPERTY LABELS "Fortran") else() add_test(FortranC ${CMAKE_CTEST_COMMAND} --build-and-test @@ -3395,6 +3405,7 @@ if(BUILD_TESTING) --build-two-config --test-command CMakeFiles/FortranCInterface/FortranCInterface) list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/FortranC") + set_property(TEST FortranC APPEND PROPERTY LABELS "Fortran") endif() endif() diff --git a/Tests/CMakeOnly/CMakeLists.txt b/Tests/CMakeOnly/CMakeLists.txt index 30cabf1..ea06464 100644 --- a/Tests/CMakeOnly/CMakeLists.txt +++ b/Tests/CMakeOnly/CMakeLists.txt @@ -25,8 +25,8 @@ add_CMakeOnly_test(CheckCXXSymbolExists) add_CMakeOnly_test(CheckCXXCompilerFlag) add_CMakeOnly_test(CheckLanguage) +set_property(TEST CMakeOnly.CheckLanguage APPEND PROPERTY LABELS "HIP" "Fortran") if (CMake_TEST_HIP) - set_property(TEST CMakeOnly.CheckLanguage APPEND PROPERTY LABELS "HIP") add_CMakeOnly_test(CheckLanguageHIPPlatform) set_property(TEST CMakeOnly.CheckLanguageHIPPlatform APPEND PROPERTY LABELS "HIP") add_CMakeOnly_test(CheckLanguageHIPPlatform2) @@ -52,6 +52,7 @@ endif() if(CMAKE_Fortran_COMPILER) add_CMakeOnly_test(CompilerIdFortran) + set_property(TEST CMakeOnly.CompilerIdFortran APPEND PROPERTY LABELS "Fortran") endif() if(CMAKE_GENERATOR MATCHES "Visual Studio ([^9]|9[0-9])") add_CMakeOnly_test(CompilerIdCSharp) diff --git a/Tests/CustomCommand/CMakeLists.txt b/Tests/CustomCommand/CMakeLists.txt index 25df300..d46ee08 100644 --- a/Tests/CustomCommand/CMakeLists.txt +++ b/Tests/CustomCommand/CMakeLists.txt @@ -214,11 +214,13 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/generated_extern.cxx add_executable(CustomCommandUsingTargetTest main.cxx ${CMAKE_CURRENT_BINARY_DIR}/generated_extern.cxx ) +add_executable(CustomCommandUsingTargetTestAlias ALIAS CustomCommandUsingTargetTest ) + add_custom_target(RunTarget COMMAND generator_extern ${CMAKE_CURRENT_BINARY_DIR}/run_target.cxx ) -add_custom_command(TARGET CustomCommandUsingTargetTest POST_BUILD +add_custom_command(TARGET CustomCommandUsingTargetTestAlias POST_BUILD COMMAND dummy_generator ${CMAKE_CURRENT_BINARY_DIR}/generated_dummy.cxx) add_subdirectory(GeneratorInExtraDir) diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index f1baf92..4d3efd3 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -151,6 +151,7 @@ if("${CMAKE_C_COMPILER_ID}" STREQUAL "LCC" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "LCC" OR "${CMAKE_Fortran_COMPILER_ID}" STREQUAL "LCC") add_RunCMake_test("CMP0129") + set_property(TEST RunCMake.CMP0129 APPEND PROPERTY LABELS "Fortran") endif() add_RunCMake_test(CMP0132) @@ -225,6 +226,7 @@ if(CMAKE_GENERATOR MATCHES "Ninja") endif() endif() add_RunCMake_test(Ninja) + set_property(TEST RunCMake.Ninja APPEND PROPERTY LABELS "Fortran") set(NinjaMultiConfig_ARGS -DCYGWIN=${CYGWIN} -DMSYS=${MSYS} ) @@ -321,6 +323,7 @@ add_RunCMake_test(BuildDepends -DCMAKE_C_LINK_DEPENDS_USE_COMPILER=${CMAKE_C_LINK_DEPENDS_USE_COMPILER} -DCMake_TEST_BuildDepends_GNU_AS=${CMake_TEST_BuildDepends_GNU_AS} ) +set_property(TEST RunCMake.BuildDepends APPEND PROPERTY LABELS "Fortran") add_RunCMake_test(BuiltinTargets) if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Unix Makefiles|Ninja") add_RunCMake_test(Byproducts) @@ -364,7 +367,7 @@ foreach(lang IN ITEMS CUDA HIP ISPC) endif() endforeach() add_RunCMake_test(CompilerTest) -set_property(TEST RunCMake.CompilerTest APPEND PROPERTY LABELS "CUDA" "HIP" "ISPC") +set_property(TEST RunCMake.CompilerTest APPEND PROPERTY LABELS "CUDA" "HIP" "ISPC" "Fortran") add_RunCMake_test(Configure -DMSVC_IDE=${MSVC_IDE}) add_RunCMake_test(DisallowedCommands) if("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles|Ninja") @@ -490,6 +493,7 @@ add_RunCMake_test(add_dependencies) add_RunCMake_test(add_executable) add_RunCMake_test(add_library) add_RunCMake_test(add_subdirectory -DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER}) +set_property(TEST RunCMake.add_subdirectory APPEND PROPERTY LABELS "Fortran") add_RunCMake_test(add_test -DPSEUDO_EMULATOR=$<TARGET_FILE:pseudo_emulator>) add_RunCMake_test(build_command) add_executable(exit_code exit_code.c) @@ -611,6 +615,8 @@ if(CMAKE_Fortran_COMPILER) list(APPEND try_run_ARGS -DCMake_TEST_Fortran=1) endif() add_RunCMake_test(try_run) +set_property(TEST RunCMake.try_run APPEND PROPERTY LABELS "Fortran") + add_RunCMake_test(set) add_RunCMake_test(variable_watch) add_RunCMake_test(while) @@ -629,7 +635,9 @@ if(CMake_TEST_CUDA) add_RunCMake_test(CUDA_architectures) set_property(TEST RunCMake.CUDA_architectures APPEND PROPERTY LABELS "CUDA") endif() + add_RunCMake_test(DependencyGraph -DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER}) +set_property(TEST RunCMake.DependencyGraph APPEND PROPERTY LABELS "Fortran") # Add C++ Module tests. add_RunCMake_test(CXXModules -DCMake_TEST_MODULE_COMPILATION=${CMake_TEST_MODULE_COMPILATION} -DCMake_TEST_MODULE_COMPILATION_RULES=${CMake_TEST_MODULE_COMPILATION_RULES}) @@ -839,14 +847,10 @@ add_RunCMake_test(CheckSourceRuns -DCMake_TEST_CUDA=${CMake_TEST_CUDA} set_property(TEST RunCMake.CheckCompilerFlag RunCMake.CheckSourceCompiles RunCMake.CheckSourceRuns - APPEND PROPERTY LABELS "CUDA") + APPEND PROPERTY LABELS "CUDA" "HIP" "Fortran") set_property(TEST RunCMake.CheckSourceCompiles RunCMake.CheckCompilerFlag APPEND PROPERTY LABELS "ISPC") -set_property(TEST RunCMake.CheckCompilerFlag - RunCMake.CheckSourceCompiles - RunCMake.CheckSourceRuns - APPEND PROPERTY LABELS "HIP") add_RunCMake_test(CheckModules) add_RunCMake_test(CheckIPOSupported) if (CMAKE_SYSTEM_NAME MATCHES "(Linux|Darwin)" @@ -855,8 +859,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "(Linux|Darwin)" -DCMAKE_Fortran_COMPILER_ID=${CMAKE_Fortran_COMPILER_ID} -DCMake_TEST_CUDA=${CMake_TEST_CUDA} -DCMake_TEST_HIP=${CMake_TEST_HIP}) - set_property(TEST RunCMake.CheckLinkerFlag APPEND PROPERTY LABELS "CUDA") - set_property(TEST RunCMake.CheckLinkerFlag APPEND PROPERTY LABELS "HIP") + set_property(TEST RunCMake.CheckLinkerFlag APPEND PROPERTY LABELS "CUDA" "HIP" "Fortran") endif() @@ -974,6 +977,7 @@ if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja") -DPSEUDO_CPPLINT=$<TARGET_FILE:pseudo_cpplint> -DPSEUDO_CPPCHECK=$<TARGET_FILE:pseudo_cppcheck> ) + if(DEFINED CMake_TEST_CUDA) list(APPEND CompilerLauncher_ARGS -DCMake_TEST_CUDA=${CMake_TEST_CUDA}) endif() @@ -992,7 +996,8 @@ if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja") endif() add_RunCMake_test(CompilerLauncher) set_property(TEST RunCMake.CompilerLauncher APPEND - PROPERTY LABELS "CUDA;HIP;ISPC") + PROPERTY LABELS "CUDA" "HIP" "ISPC" "Fortran") + add_RunCMake_test(ctest_labels_for_subprojects) add_RunCMake_test(CompilerArgs) add_RunCMake_test(LinkerLauncher) diff --git a/Tests/UseSWIG/CMakeLists.txt b/Tests/UseSWIG/CMakeLists.txt index 3d80270..0971025 100644 --- a/Tests/UseSWIG/CMakeLists.txt +++ b/Tests/UseSWIG/CMakeLists.txt @@ -134,6 +134,7 @@ if (CMake_TEST_UseSWIG_Fortran) --build-options ${build_options} --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION> ) + set_property(TEST UseSWIG.BasicFortran APPEND PROPERTY LABELS "Fortran") endif() endif() |