diff options
| author | Fred Baksik <fdk17@ftml.net> | 2020-07-15 15:03:45 -0400 |
|---|---|---|
| committer | Fred Baksik <fred.baksik@mrcy.com> | 2020-07-23 14:52:48 -0400 |
| commit | 6f1af899db4e93c960145dae12ebaacb308ea1f0 (patch) | |
| tree | 83ffcfdd61df3d600ca587c06b551b9903f2b130 /Modules/CMakeDetermineJavaCompiler.cmake | |
| parent | ec1d3bc0b64550307c23ceae7ef542124b68e2e5 (diff) | |
| download | cmake-6f1af899db4e93c960145dae12ebaacb308ea1f0.tar.gz | |
Toolchain: Capture all arguments from CMAKE_<LANG>_COMPILER
Capture CMAKE_<LANG>_COMPILER_ARG1 from CMAKE_<LANG>_COMPILER in the
same fashion that it is from $ENV{<LANG>}.
Since get_filename_component() returns a single string of all the
arguments from $ENV{<LANG>}, a single string of arguments will be
constructed from the items contained in CMAKE_<LANG>_COMPILER.
Fixes #20089
Diffstat (limited to 'Modules/CMakeDetermineJavaCompiler.cmake')
| -rw-r--r-- | Modules/CMakeDetermineJavaCompiler.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineJavaCompiler.cmake b/Modules/CMakeDetermineJavaCompiler.cmake index 3092bb52d6..db456c0043 100644 --- a/Modules/CMakeDetermineJavaCompiler.cmake +++ b/Modules/CMakeDetermineJavaCompiler.cmake @@ -11,7 +11,7 @@ if(NOT CMAKE_Java_COMPILER) if(NOT $ENV{JAVA_COMPILER} STREQUAL "") get_filename_component(CMAKE_Java_COMPILER_INIT $ENV{JAVA_COMPILER} PROGRAM PROGRAM_ARGS CMAKE_Java_FLAGS_ENV_INIT) if(CMAKE_Java_FLAGS_ENV_INIT) - set(CMAKE_Java_COMPILER_ARG1 "${CMAKE_Java_FLAGS_ENV_INIT}" CACHE STRING "First argument to Java compiler") + set(CMAKE_Java_COMPILER_ARG1 "${CMAKE_Java_FLAGS_ENV_INIT}" CACHE STRING "Arguments to Java compiler") endif() if(NOT EXISTS ${CMAKE_Java_COMPILER_INIT}) message(SEND_ERROR "Could not find compiler set in environment variable JAVA_COMPILER:\n$ENV{JAVA_COMPILER}.") |