diff --git a/Help/prop_tgt/LANG_LINKER_LAUNCHER.rst b/Help/prop_tgt/LANG_LINKER_LAUNCHER.rst index 1669504d97..875cf740bc 100644 --- a/Help/prop_tgt/LANG_LINKER_LAUNCHER.rst +++ b/Help/prop_tgt/LANG_LINKER_LAUNCHER.rst @@ -6,13 +6,25 @@ This property is implemented only when ```` is one of: * ``C`` + * ``CXX`` + +* ``CUDA`` + + .. versionadded:: 4.1 + * ``OBJC`` + * ``OBJCXX`` + * ``Fortran`` .. versionadded:: 4.1 +* ``HIP`` + + .. versionadded:: 4.1 + Specify a :ref:`semicolon-separated list ` containing a command line for a linker launching tool. The :ref:`Makefile Generators` and the :generator:`Ninja` generator will run this tool and pass the linker and its diff --git a/Help/release/dev/linker-launcher.rst b/Help/release/dev/linker-launcher.rst index 438bf3d988..78badc9932 100644 --- a/Help/release/dev/linker-launcher.rst +++ b/Help/release/dev/linker-launcher.rst @@ -2,6 +2,6 @@ linker-launcher --------------- * :ref:`Makefile Generators` and :ref:`Ninja Generators` gained support - for adding a linker launcher with ``Fortran``. + for adding a linker launcher with ``Fortran``, ``CUDA``, and ``HIP``. See the :variable:`CMAKE__LINKER_LAUNCHER` variable and :prop_tgt:`_LINKER_LAUNCHER` target property for details. diff --git a/Help/variable/CMAKE_LANG_LINKER_LAUNCHER.rst b/Help/variable/CMAKE_LANG_LINKER_LAUNCHER.rst index c28627976d..d51951ac4e 100644 --- a/Help/variable/CMAKE_LANG_LINKER_LAUNCHER.rst +++ b/Help/variable/CMAKE_LANG_LINKER_LAUNCHER.rst @@ -8,12 +8,24 @@ variable is used to initialize the property on each target as it is created. This is done only when ```` is one of: * ``C`` + * ``CXX`` + +* ``CUDA`` + + .. versionadded:: 4.1 + * ``OBJC`` + * ``OBJCXX`` + * ``Fortran`` .. versionadded:: 4.1 +* ``HIP`` + + .. versionadded:: 4.1 + This variable is initialized to the :envvar:`CMAKE__LINKER_LAUNCHER` environment variable if it is set. diff --git a/Modules/CMakeCUDAInformation.cmake b/Modules/CMakeCUDAInformation.cmake index 49a4270a83..7ce3112301 100644 --- a/Modules/CMakeCUDAInformation.cmake +++ b/Modules/CMakeCUDAInformation.cmake @@ -75,6 +75,11 @@ if(NOT CMAKE_CUDA_COMPILER_LAUNCHER AND DEFINED ENV{CMAKE_CUDA_COMPILER_LAUNCHER CACHE STRING "Compiler launcher for CUDA.") endif() +if(NOT CMAKE_CUDA_LINKER_LAUNCHER AND DEFINED ENV{CMAKE_CUDA_LINKER_LAUNCHER}) + set(CMAKE_CUDA_LINKER_LAUNCHER "$ENV{CMAKE_CUDA_LINKER_LAUNCHER}" + CACHE STRING "Linker launcher for CUDA.") +endif() + include(CMakeCommonLanguageInclude) _cmake_common_language_platform_flags(CUDA) diff --git a/Modules/CMakeHIPInformation.cmake b/Modules/CMakeHIPInformation.cmake index f015cdf362..13a062c302 100644 --- a/Modules/CMakeHIPInformation.cmake +++ b/Modules/CMakeHIPInformation.cmake @@ -55,6 +55,11 @@ if(NOT CMAKE_HIP_COMPILER_LAUNCHER AND DEFINED ENV{CMAKE_HIP_COMPILER_LAUNCHER}) CACHE STRING "Compiler launcher for HIP.") endif() +if(NOT CMAKE_HIP_LINKER_LAUNCHER AND DEFINED ENV{CMAKE_HIP_LINKER_LAUNCHER}) + set(CMAKE_HIP_LINKER_LAUNCHER "$ENV{CMAKE_HIP_LINKER_LAUNCHER}" + CACHE STRING "Linker launcher for HIP.") +endif() + include(CMakeCommonLanguageInclude) _cmake_common_language_platform_flags(HIP) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index e0610fcd5d..8c4973a1f9 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -449,9 +449,11 @@ TargetProperty const StaticTargetProperties[] = { // ---- C++ { "CXX_LINKER_LAUNCHER"_s, IC::CanCompileSources }, // ---- CUDA + { "CUDA_LINKER_LAUNCHER"_s, IC::CanCompileSources }, { "CUDA_RESOLVE_DEVICE_SYMBOLS"_s, IC::CanCompileSources }, { "CUDA_RUNTIME_LIBRARY"_s, IC::CanCompileSources }, // ---- HIP + { "HIP_LINKER_LAUNCHER"_s, IC::CanCompileSources }, { "HIP_RUNTIME_LIBRARY"_s, IC::CanCompileSources }, // ---- Objective C { "OBJC_LINKER_LAUNCHER"_s, IC::CanCompileSources }, diff --git a/Tests/RunCMake/LinkerLauncher/CUDA-Build-stdout.txt b/Tests/RunCMake/LinkerLauncher/CUDA-Build-stdout.txt new file mode 100644 index 0000000000..3313e31f63 --- /dev/null +++ b/Tests/RunCMake/LinkerLauncher/CUDA-Build-stdout.txt @@ -0,0 +1 @@ +.*-E env USED_LAUNCHER=1.* diff --git a/Tests/RunCMake/LinkerLauncher/CUDA-common.cmake b/Tests/RunCMake/LinkerLauncher/CUDA-common.cmake new file mode 100644 index 0000000000..ca25b2a262 --- /dev/null +++ b/Tests/RunCMake/LinkerLauncher/CUDA-common.cmake @@ -0,0 +1,4 @@ +cmake_policy(SET CMP0104 NEW) +enable_language(CUDA) +set(CMAKE_VERBOSE_MAKEFILE TRUE) +add_executable(main main.cu) diff --git a/Tests/RunCMake/LinkerLauncher/CUDA-env-Build-stdout.txt b/Tests/RunCMake/LinkerLauncher/CUDA-env-Build-stdout.txt new file mode 100644 index 0000000000..a6e8b0aba6 --- /dev/null +++ b/Tests/RunCMake/LinkerLauncher/CUDA-env-Build-stdout.txt @@ -0,0 +1 @@ +.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=CUDA.* diff --git a/Tests/RunCMake/LinkerLauncher/CUDA-env.cmake b/Tests/RunCMake/LinkerLauncher/CUDA-env.cmake new file mode 100644 index 0000000000..cefbe9ede8 --- /dev/null +++ b/Tests/RunCMake/LinkerLauncher/CUDA-env.cmake @@ -0,0 +1 @@ +include(CUDA-common.cmake) diff --git a/Tests/RunCMake/LinkerLauncher/CUDA-launch-Build-stdout.txt b/Tests/RunCMake/LinkerLauncher/CUDA-launch-Build-stdout.txt new file mode 100644 index 0000000000..3313e31f63 --- /dev/null +++ b/Tests/RunCMake/LinkerLauncher/CUDA-launch-Build-stdout.txt @@ -0,0 +1 @@ +.*-E env USED_LAUNCHER=1.* diff --git a/Tests/RunCMake/LinkerLauncher/CUDA-launch-env-Build-stdout.txt b/Tests/RunCMake/LinkerLauncher/CUDA-launch-env-Build-stdout.txt new file mode 100644 index 0000000000..a6e8b0aba6 --- /dev/null +++ b/Tests/RunCMake/LinkerLauncher/CUDA-launch-env-Build-stdout.txt @@ -0,0 +1 @@ +.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=CUDA.* diff --git a/Tests/RunCMake/LinkerLauncher/CUDA-launch-env.cmake b/Tests/RunCMake/LinkerLauncher/CUDA-launch-env.cmake new file mode 100644 index 0000000000..d0d777aeb2 --- /dev/null +++ b/Tests/RunCMake/LinkerLauncher/CUDA-launch-env.cmake @@ -0,0 +1,3 @@ +set(CTEST_USE_LAUNCHERS 1) +include(CTestUseLaunchers) +include(CUDA-env.cmake) diff --git a/Tests/RunCMake/LinkerLauncher/CUDA-launch.cmake b/Tests/RunCMake/LinkerLauncher/CUDA-launch.cmake new file mode 100644 index 0000000000..6b4b816e92 --- /dev/null +++ b/Tests/RunCMake/LinkerLauncher/CUDA-launch.cmake @@ -0,0 +1,3 @@ +set(CTEST_USE_LAUNCHERS 1) +include(CTestUseLaunchers) +include(CUDA.cmake) diff --git a/Tests/RunCMake/LinkerLauncher/CUDA.cmake b/Tests/RunCMake/LinkerLauncher/CUDA.cmake new file mode 100644 index 0000000000..3ce1ef381c --- /dev/null +++ b/Tests/RunCMake/LinkerLauncher/CUDA.cmake @@ -0,0 +1,2 @@ +set(CMAKE_CUDA_LINKER_LAUNCHER "${CMAKE_COMMAND};-E;env;USED_LAUNCHER=1") +include(CUDA-common.cmake) diff --git a/Tests/RunCMake/LinkerLauncher/HIP-common.cmake b/Tests/RunCMake/LinkerLauncher/HIP-common.cmake new file mode 100644 index 0000000000..53ece7814e --- /dev/null +++ b/Tests/RunCMake/LinkerLauncher/HIP-common.cmake @@ -0,0 +1,5 @@ +enable_language(HIP) +enable_language(CXX) +set(CMAKE_VERBOSE_MAKEFILE TRUE) + +add_executable(main main.hip) diff --git a/Tests/RunCMake/LinkerLauncher/HIP-env-Build-stdout.txt b/Tests/RunCMake/LinkerLauncher/HIP-env-Build-stdout.txt new file mode 100644 index 0000000000..354e317028 --- /dev/null +++ b/Tests/RunCMake/LinkerLauncher/HIP-env-Build-stdout.txt @@ -0,0 +1 @@ +.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=HIP.* diff --git a/Tests/RunCMake/LinkerLauncher/HIP-env.cmake b/Tests/RunCMake/LinkerLauncher/HIP-env.cmake new file mode 100644 index 0000000000..1bf56cee95 --- /dev/null +++ b/Tests/RunCMake/LinkerLauncher/HIP-env.cmake @@ -0,0 +1 @@ +include(HIP-common.cmake) diff --git a/Tests/RunCMake/LinkerLauncher/HIP-launch-Build-stdout.txt b/Tests/RunCMake/LinkerLauncher/HIP-launch-Build-stdout.txt new file mode 100644 index 0000000000..3313e31f63 --- /dev/null +++ b/Tests/RunCMake/LinkerLauncher/HIP-launch-Build-stdout.txt @@ -0,0 +1 @@ +.*-E env USED_LAUNCHER=1.* diff --git a/Tests/RunCMake/LinkerLauncher/HIP-launch-env-Build-stdout.txt b/Tests/RunCMake/LinkerLauncher/HIP-launch-env-Build-stdout.txt new file mode 100644 index 0000000000..354e317028 --- /dev/null +++ b/Tests/RunCMake/LinkerLauncher/HIP-launch-env-Build-stdout.txt @@ -0,0 +1 @@ +.*-E env USED_LAUNCHER=1 TARGET_NAME=main LANGUAGE=HIP.* diff --git a/Tests/RunCMake/LinkerLauncher/HIP-launch-env.cmake b/Tests/RunCMake/LinkerLauncher/HIP-launch-env.cmake new file mode 100644 index 0000000000..37985a52a3 --- /dev/null +++ b/Tests/RunCMake/LinkerLauncher/HIP-launch-env.cmake @@ -0,0 +1,3 @@ +set(CTEST_USE_LAUNCHERS 1) +include(CTestUseLaunchers) +include(HIP-env.cmake) diff --git a/Tests/RunCMake/LinkerLauncher/HIP-launch.cmake b/Tests/RunCMake/LinkerLauncher/HIP-launch.cmake new file mode 100644 index 0000000000..78fd16ba0f --- /dev/null +++ b/Tests/RunCMake/LinkerLauncher/HIP-launch.cmake @@ -0,0 +1,3 @@ +set(CTEST_USE_LAUNCHERS 1) +include(CTestUseLaunchers) +include(HIP.cmake) diff --git a/Tests/RunCMake/LinkerLauncher/HIP.cmake b/Tests/RunCMake/LinkerLauncher/HIP.cmake new file mode 100644 index 0000000000..32a750b497 --- /dev/null +++ b/Tests/RunCMake/LinkerLauncher/HIP.cmake @@ -0,0 +1,2 @@ +set(CMAKE_HIP_LINKER_LAUNCHER "${CMAKE_COMMAND};-E;env;USED_LAUNCHER=1") +include(HIP-common.cmake) diff --git a/Tests/RunCMake/LinkerLauncher/RunCMakeTest.cmake b/Tests/RunCMake/LinkerLauncher/RunCMakeTest.cmake index 754377ccca..f5775fb017 100644 --- a/Tests/RunCMake/LinkerLauncher/RunCMakeTest.cmake +++ b/Tests/RunCMake/LinkerLauncher/RunCMakeTest.cmake @@ -24,9 +24,15 @@ function(run_linker_launcher_env lang) endfunction() set(langs C CXX) +if(CMake_TEST_CUDA) + list(APPEND langs CUDA) +endif() if(CMake_TEST_Fortran) list(APPEND langs Fortran) endif() +if(CMake_TEST_HIP) + list(APPEND langs HIP) +endif() if(CMake_TEST_OBJC) list(APPEND langs OBJC OBJCXX) endif() diff --git a/Tests/RunCMake/LinkerLauncher/main.cu b/Tests/RunCMake/LinkerLauncher/main.cu new file mode 100644 index 0000000000..f8b643afbf --- /dev/null +++ b/Tests/RunCMake/LinkerLauncher/main.cu @@ -0,0 +1,4 @@ +int main() +{ + return 0; +} diff --git a/Tests/RunCMake/LinkerLauncher/main.hip b/Tests/RunCMake/LinkerLauncher/main.hip new file mode 100644 index 0000000000..f8b643afbf --- /dev/null +++ b/Tests/RunCMake/LinkerLauncher/main.hip @@ -0,0 +1,4 @@ +int main() +{ + return 0; +}