Merge commit 'bd219baa90573303400126d80b42608dc0fe394c' into corrosion

amunra · amunra · commit efc4ea6d5408 · 2022-06-14T12:19:05.000+01:00
diff --git a/corrosion/cmake/Corrosion.cmake b/corrosion/cmake/Corrosion.cmake
@@ -130,7 +130,7 @@ endif()
 
 function(_add_cargo_build)
     set(options "")
-    set(one_value_args PACKAGE TARGET MANIFEST_PATH PROFILE LINKER_LANGUAGE)
+    set(one_value_args PACKAGE TARGET MANIFEST_PATH PROFILE LINK_AS)
     set(multi_value_args BYPRODUCTS)
     cmake_parse_arguments(
         ACB
@@ -160,8 +160,8 @@ function(_add_cargo_build)
     # For MSVC targets, don't mess with linker preferences.
     # TODO: We still should probably make sure that rustc is using the correct cl.exe to link programs.
     if (NOT MSVC)
-        if (ACB_LINKER_LANGUAGE)
-            set(languages ${ACB_LINKER_LANGUAGE})
+        if (ACB_LINK_AS)
+            set(languages ${ACB_LINK_AS})
         else()
             set(languages C CXX Fortran)
         endif()
@@ -395,7 +395,7 @@ endfunction(_add_cargo_build)
 
 function(corrosion_import_crate)
     set(OPTIONS ALL_FEATURES NO_DEFAULT_FEATURES NO_STD)
-    set(ONE_VALUE_KEYWORDS MANIFEST_PATH PROFILE LINKER_LANGUAGE)
+    set(ONE_VALUE_KEYWORDS MANIFEST_PATH PROFILE LINK_AS)
     set(MULTI_VALUE_KEYWORDS CRATES FEATURES)
     cmake_parse_arguments(COR "${OPTIONS}" "${ONE_VALUE_KEYWORDS}" "${MULTI_VALUE_KEYWORDS}" ${ARGN})
 
@@ -404,8 +404,8 @@ function(corrosion_import_crate)
     endif()
 
     set(valid_languages C CXX Fortran)
-    if ((DEFINED COR_LINKER_LANGUAGE) AND (NOT COR_LINKER_LANGUAGE IN_LIST valid_languages))
-        message(FATAL_ERROR "LINKER_LANGUAGE may only be set to one of ${valid_languages}.")
+    if ((DEFINED COR_LINK_AS) AND (NOT COR_LINK_AS IN_LIST valid_languages))
+        message(FATAL_ERROR "LINK_AS may only be set to one of ${valid_languages}.")
     endif()
 
     if(COR_PROFILE)
@@ -474,8 +474,8 @@ function(corrosion_import_crate)
             list(APPEND crates_args --crates ${crate})
         endforeach()
 
-        if (COR_LINKER_LANGUAGE)
-            set(linker_language "--linker-language=${COR_LINKER_LANGUAGE}")
+        if (COR_LINK_AS)
+            set(link_as "--linker-language=${COR_LINK_AS}")
         endif()
 
         execute_process(
@@ -488,7 +488,7 @@ function(corrosion_import_crate)
                         ${_CORROSION_CONFIGURATION_TYPES}
                         ${crates_args}
                         ${cargo_profile}
-                        ${linker_language}
+                        ${link_as}
                         ${no_default_libs_arg}
                         --cargo-version ${_CORROSION_CARGO_VERSION}
                         -o ${generated_cmake}
@@ -518,8 +518,8 @@ function(corrosion_import_crate)
                 "${COR_CRATES}"
             PROFILE
                 "${COR_PROFILE}"
-            LINKER_LANGUAGE
-                "${COR_LINKER_LANGUAGE}"
+            LINK_AS
+                "${COR_LINK_AS}"
         )
     endif()
 endfunction(corrosion_import_crate)
diff --git a/corrosion/cmake/CorrosionGenerator.cmake b/corrosion/cmake/CorrosionGenerator.cmake
@@ -198,7 +198,7 @@ function(_generator_parse_target manifest package target)
     )
 endfunction()
 
-function(_generator_add_target manifest ix cargo_version profile linker_language)
+function(_generator_add_target manifest ix cargo_version profile link_as)
     get_source_file_property(package_name ${manifest} CORROSION_TARGET${ix}_PACKAGE_NAME)
     get_source_file_property(manifest_path ${manifest} CORROSION_TARGET${ix}_MANIFEST_PATH)
     get_source_file_property(target_name ${manifest} CORROSION_TARGET${ix}_TARGET_NAME)
@@ -332,7 +332,7 @@ function(_generator_add_target manifest ix cargo_version profile linker_language
             MANIFEST_PATH "${manifest_path}"
             BYPRODUCTS ${byproducts}
             PROFILE "${profile}"
-            LINKER_LANGUAGE ${linker_language}
+            LINK_AS ${link_as}
     )
 endfunction()
 
@@ -399,7 +399,7 @@ endfunction()
 
 function(_generator_add_cargo_targets)
     set(options "")
-    set(one_value_args MANIFEST_PATH CONFIGURATION_ROOT CONFIGURATION_TYPE TARGET CARGO_VERSION PROFILE LINKER_LANGUAGE)
+    set(one_value_args MANIFEST_PATH CONFIGURATION_ROOT CONFIGURATION_TYPE TARGET CARGO_VERSION PROFILE LINK_AS)
     set(multi_value_args CONFIGURATION_TYPES CRATES)
     cmake_parse_arguments(
         GGC
@@ -482,7 +482,7 @@ function(_generator_add_cargo_targets)
             ${ix}
             ${GGC_CARGO_VERSION}
             "${GGC_PROFILE}"
-            "${GGC_LINKER_LANGUAGE}"
+            "${GGC_LINK_AS}"
         )
     endforeach()
 
diff --git a/corrosion/generator/src/subcommands/gen_cmake.rs b/corrosion/generator/src/subcommands/gen_cmake.rs
@@ -23,7 +23,7 @@ const CONFIGURATION_ROOT: &str = "configuration-root";
 const TARGET: &str = "target";
 const CARGO_VERSION: &str = "cargo-version";
 const PROFILE: &str = "profile";
-const LINKER_LANGUAGE: &str = "linker-language";
+const LINK_AS: &str = "linker-language";
 const CRATES: &str = "crates";
 const NO_DEFAULT_LIBRARIES: &str = "no-default-libraries";
 
@@ -94,9 +94,9 @@ pub fn subcommand() -> App<'static, 'static> {
                 .help("Custom cargo profile to select."),
         )
         .arg(
-            Arg::with_name(LINKER_LANGUAGE)
-                .long(LINKER_LANGUAGE)
-                .value_name("LINKER_LANGUAGE")
+            Arg::with_name(LINK_AS)
+                .long(LINK_AS)
+                .value_name("LINK_AS")
                 .required(false)
                 .possible_values(&["C", "CXX", "Fortran"])
                 .help("Language to select a linker by: C, CXX or Fortran.")
@@ -201,7 +201,7 @@ cmake_minimum_required(VERSION 3.15)
         .collect();
 
     let cargo_profile = matches.value_of(PROFILE);
-    let linker_language = matches.value_of(LINKER_LANGUAGE);
+    let link_as = matches.value_of(LINK_AS);
 
     for target in &targets {
         target
@@ -210,7 +210,7 @@ cmake_minimum_required(VERSION 3.15)
                 &cargo_platform,
                 &cargo_version,
                 cargo_profile,
-                linker_language,
+                link_as,
                 !matches.is_present(NO_DEFAULT_LIBRARIES),
             )
             .unwrap();
diff --git a/corrosion/generator/src/subcommands/gen_cmake/target.rs b/corrosion/generator/src/subcommands/gen_cmake/target.rs
@@ -104,7 +104,7 @@ impl CargoTarget {
         platform: &super::platform::Platform,
         cargo_version: &semver::Version,
         cargo_profile: Option<&str>,
-        linker_language: Option<&str>,
+        link_as: Option<&str>,
         include_platform_libs: bool,
     ) -> Result<(), Box<dyn Error>> {
         // This bit aggregates the byproducts of "cargo build", which is needed for generators like Ninja.
@@ -161,8 +161,8 @@ impl CargoTarget {
             String::default()
         };
 
-        let linker_language_option = if let Some(linker_language) = linker_language {
-            format!("LINKER_LANGUAGE {}", linker_language)
+        let link_as_option = if let Some(link_as) = link_as {
+            format!("LINK_AS {}", link_as)
         }
         else {
             String::default()
@@ -286,7 +286,7 @@ _add_cargo_build(
             self.cargo_package.manifest_path.as_str().replace("\\", "/"),
             byproducts.join(" "),
             cargo_build_profile_option,
-            linker_language_option
+            link_as_option
         )?;
 
         writeln!(out_file)?;
