Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support parsing cargo metadata by string(JSON ...) for cmake >= 3.19 #131

Merged
merged 7 commits into from
Feb 3, 2022
Merged

Support parsing cargo metadata by string(JSON ...) for cmake >= 3.19 #131

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d551de4
Support parsing cargo metadata by string(JSON ...) for cmake >= 3.19
crabtw Jan 3, 2022
a11ba3b
Execute cmake commands instead of writing file when parsing metadata
crabtw Jan 25, 2022
2a11e75
Support custom profile for CorrosionGenerator.cmake
crabtw Jan 26, 2022
1bcdd5c
Set variable before appending list
crabtw Jan 26, 2022
9afac41
Rename the parser option and add description to README.md
crabtw Jan 27, 2022
8ce9b29
Address review comments
crabtw Jan 27, 2022
6fdf097
Address review comments
crabtw Jan 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ install(
install(
FILES
cmake/Corrosion.cmake
cmake/CorrosionGenerator.cmake
cmake/FindRust.cmake
DESTINATION
${CORROSION_INSTALL_PREFIX}${CMAKE_INSTALL_DATADIR}/cmake
Expand Down
156 changes: 99 additions & 57 deletions cmake/Corrosion.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,20 @@ if (CMAKE_GENERATOR STREQUAL "Ninja Multi-Config")
"https://github.com/corrosion-rs/corrosion/issues/50")
endif()

if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.19.0)
set(_CORROSION_CMAKE_GREATER_EQUAL_3_19 ON)
else()
set(_CORROSION_CMAKE_GREATER_EQUAL_3_19 OFF)
endif()

option(CORROSION_VERBOSE_OUTPUT "Enables verbose output from Corrosion and Cargo" OFF)

option(
CORROSION_PARSE_METADATA_BY_CMAKE
"Enable Corrosion to parse cargo metadata by cmake string(JSON ...) command"
${_CORROSION_CMAKE_GREATER_EQUAL_3_19}
)

find_package(Rust REQUIRED)

if (NOT TARGET Corrosion::Generator)
Expand All @@ -24,6 +36,10 @@ get_property(
TARGET Rust::Cargo PROPERTY IMPORTED_LOCATION
)

if (_CORROSION_CMAKE_GREATER_EQUAL_3_19 AND CORROSION_PARSE_METADATA_BY_CMAKE)
include(CorrosionGenerator)
endif()

if (NOT TARGET Corrosion::Generator)
set(_CORROSION_GENERATOR_EXE
${CARGO_EXECUTABLE} run --quiet --manifest-path "${CMAKE_CURRENT_LIST_DIR}/../generator/Cargo.toml" --)
Expand Down Expand Up @@ -112,6 +128,9 @@ function(_add_cargo_build)
enable_language(C)
endif()

set(link_prefs)
set(compilers)
set(lang_targets)
foreach(language ${languages})
if(CMAKE_${language}_COMPILER AND (CMAKE_${language}_LINKER_PREFERENCE_PROPAGATES OR CMAKE_CROSSCOMPILING))
list(
Expand Down Expand Up @@ -185,7 +204,7 @@ function(_add_cargo_build)
# can only add double quotes here. Any double quotes _in_ the rustflags must be escaped like `\\\"`.
set(rustflags_genex "$<$<BOOL:${rustflags_target_property}>:--rustflags=\"${rustflags_target_property}\">")

if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.19.0)
if (_CORROSION_CMAKE_GREATER_EQUAL_3_19)
set(build_env_variable_genex "$<GENEX_EVAL:$<TARGET_PROPERTY:${target_name},CORROSION_ENVIRONMENT_VARIABLES>>")

set(features_target_property "$<GENEX_EVAL:$<TARGET_PROPERTY:${target_name},CORROSION_FEATURES>>")
Expand Down Expand Up @@ -218,6 +237,8 @@ function(_add_cargo_build)
endif()

set(cargo_build_dir "${CMAKE_BINARY_DIR}/${build_dir}/cargo/build/${target_artifact_dir}/${build_type_dir}")
set(build_byproducts)
set(byproducts)
foreach(byproduct_file ${ACB_BYPRODUCTS})
list(APPEND build_byproducts "${cargo_build_dir}/${byproduct_file}")
if (NOT CMAKE_CONFIGURATION_TYPES)
Expand Down Expand Up @@ -312,72 +333,93 @@ function(corrosion_import_crate)
set(COR_MANIFEST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/${COR_MANIFEST_PATH})
endif()

execute_process(
COMMAND
${_CORROSION_GENERATOR}
--manifest-path ${COR_MANIFEST_PATH}
print-root
OUTPUT_VARIABLE toml_dir
RESULT_VARIABLE ret)

if (NOT ret EQUAL "0")
message(FATAL_ERROR "corrosion-generator failed: ${ret}")
endif()
if (_CORROSION_CMAKE_GREATER_EQUAL_3_19 AND CORROSION_PARSE_METADATA_BY_CMAKE)
_generator_add_cargo_targets(
MANIFEST_PATH
"${COR_MANIFEST_PATH}"
CONFIGURATION_ROOT
"${CMAKE_VS_PLATFORM_NAME}"
TARGET
"${_CORROSION_RUST_CARGO_TARGET}"
CARGO_VERSION
"${_CORROSION_CARGO_VERSION}"
CONFIGURATION_TYPE
"${CMAKE_BUILD_TYPE}"
CONFIGURATION_TYPES
"${CMAKE_CONFIGURATION_TYPES}"
CRATES
"${COR_CRATES}"
PROFILE
"${COR_PROFILE}"
)
else()
execute_process(
COMMAND
${_CORROSION_GENERATOR}
--manifest-path ${COR_MANIFEST_PATH}
print-root
OUTPUT_VARIABLE toml_dir
RESULT_VARIABLE ret)

if (NOT ret EQUAL "0")
message(FATAL_ERROR "corrosion-generator failed: ${ret}")
endif()

string(STRIP "${toml_dir}" toml_dir)
string(STRIP "${toml_dir}" toml_dir)

get_filename_component(toml_dir_name ${toml_dir} NAME)
get_filename_component(toml_dir_name ${toml_dir} NAME)

set(
generated_cmake
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/corrosion/${toml_dir_name}.dir/cargo-build.cmake"
)
set(
generated_cmake
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/corrosion/${toml_dir_name}.dir/cargo-build.cmake"
)

if (CMAKE_VS_PLATFORM_NAME)
set (_CORROSION_CONFIGURATION_ROOT --configuration-root ${CMAKE_VS_PLATFORM_NAME})
endif()
if (CMAKE_VS_PLATFORM_NAME)
set (_CORROSION_CONFIGURATION_ROOT --configuration-root ${CMAKE_VS_PLATFORM_NAME})
endif()

if (_CORROSION_RUST_CARGO_TARGET)
set(_CORROSION_TARGET --target ${_CORROSION_RUST_CARGO_TARGET})
endif()
if (_CORROSION_RUST_CARGO_TARGET)
set(_CORROSION_TARGET --target ${_CORROSION_RUST_CARGO_TARGET})
endif()

if(CMAKE_CONFIGURATION_TYPES)
string (REPLACE ";" "," _CONFIGURATION_TYPES
"${CMAKE_CONFIGURATION_TYPES}")
set (_CORROSION_CONFIGURATION_TYPES --configuration-types
${_CONFIGURATION_TYPES})
elseif(CMAKE_BUILD_TYPE)
set (_CORROSION_CONFIGURATION_TYPES --configuration-type
${CMAKE_BUILD_TYPE})
else()
# uses default build type
endif()
if(CMAKE_CONFIGURATION_TYPES)
string (REPLACE ";" "," _CONFIGURATION_TYPES
"${CMAKE_CONFIGURATION_TYPES}")
set (_CORROSION_CONFIGURATION_TYPES --configuration-types
${_CONFIGURATION_TYPES})
elseif(CMAKE_BUILD_TYPE)
set (_CORROSION_CONFIGURATION_TYPES --configuration-type
${CMAKE_BUILD_TYPE})
else()
# uses default build type
endif()

set(crates_args)
foreach(crate ${COR_CRATES})
list(APPEND crates_args --crates ${crate})
endforeach()
set(crates_args)
foreach(crate ${COR_CRATES})
list(APPEND crates_args --crates ${crate})
endforeach()

execute_process(
COMMAND
${_CORROSION_GENERATOR}
--manifest-path ${COR_MANIFEST_PATH}
gen-cmake
${_CORROSION_CONFIGURATION_ROOT}
${_CORROSION_TARGET}
${_CORROSION_CONFIGURATION_TYPES}
${crates_args}
${cargo_profile}
--cargo-version ${_CORROSION_CARGO_VERSION}
-o ${generated_cmake}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
RESULT_VARIABLE ret)
execute_process(
COMMAND
${_CORROSION_GENERATOR}
--manifest-path ${COR_MANIFEST_PATH}
gen-cmake
${_CORROSION_CONFIGURATION_ROOT}
${_CORROSION_TARGET}
${_CORROSION_CONFIGURATION_TYPES}
${crates_args}
${cargo_profile}
--cargo-version ${_CORROSION_CARGO_VERSION}
-o ${generated_cmake}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
RESULT_VARIABLE ret)

if (NOT ret EQUAL "0")
message(FATAL_ERROR "corrosion-generator failed")
endif()

if (NOT ret EQUAL "0")
message(FATAL_ERROR "corrosion-generator failed")
include(${generated_cmake})
endif()

include(${generated_cmake})
endfunction(corrosion_import_crate)

function(add_crate path_to_toml)
Expand Down
Loading