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

Changes from 1 commit
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
10 changes: 6 additions & 4 deletions cmake/CorrosionGenerator.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ function(_generator_parse_target manifest package target)
set(is_executable FALSE)

if("staticlib" IN_LIST kinds OR "cdylib" IN_LIST kinds)
set(is_library TUE)
set(is_library TRUE)

if("staticlib" IN_LIST kinds)
set(has_staticlib TRUE)
Expand Down Expand Up @@ -144,8 +144,8 @@ function(_generator_parse_target manifest package target)
set(implib_name "${lib_name}.dll.lib")
elseif(is_windows_gnu)
set(implib_name "lib${lib_name}.dll.a")
else()
set(implib_name "lib${lib_name}.a")
else(is_windows)
crabtw marked this conversation as resolved.
Show resolved Hide resolved
message(FATAL_ERROR "Unknown windows environment - Can't determine implib name")
endif()

set(pdb_name "${lib_name}.pdb")
Expand Down Expand Up @@ -232,6 +232,8 @@ function(_generator_add_target manifest ix cargo_version profile)
message(FATAL_ERROR "unknown target type")
endif()

# Only shared libraries and executables have PDBs on Windows
# We don't know why PDBs aren't generated for staticlibs...
if(is_windows_msvc AND (has_cdylib OR is_executable))
crabtw marked this conversation as resolved.
Show resolved Hide resolved
if(cargo_version VERSION_LESS "1.45.0")
set(prefix "deps/")
Expand All @@ -249,7 +251,7 @@ function(_generator_add_target manifest ix cargo_version profile)

if(is_library)
if(NOT (has_staticlib OR has_cdylib))
message(FATAL_ERROR "has not static or dynamic library")
message(FATAL_ERROR "Unknown library type")
endif()

if(has_staticlib)
Expand Down