Skip to content

Commit 4b5ec01

Browse files
committed
Fix building Rust libraries with C++ headers using Rust 1.26.0
I've filed rust-lang/cargo#5518 about this as the previous command worked as expected in Rust 1.25.0. It's probably not a bad idea to be more specific though.
1 parent 5956e60 commit 4b5ec01

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ ExternalProject_Add(esplugin
7777
URL "https://github.com/WrinklyNinja/esplugin/archive/1.0.9.tar.gz"
7878
CONFIGURE_COMMAND ""
7979
BUILD_IN_SOURCE 1
80-
BUILD_COMMAND cargo build --release --all --all-features --target ${RUST_TARGET}
80+
BUILD_COMMAND cargo build --release --manifest-path ffi/Cargo.toml --features ffi-headers --target ${RUST_TARGET}
8181
INSTALL_COMMAND "")
8282
ExternalProject_Get_Property(esplugin SOURCE_DIR)
8383
set (ESPLUGIN_INCLUDE_DIRS "${SOURCE_DIR}/ffi/include")
@@ -103,7 +103,7 @@ ExternalProject_Add(libloadorder
103103
URL "https://github.com/WrinklyNinja/libloadorder/archive/11.2.1.tar.gz"
104104
CONFIGURE_COMMAND ""
105105
BUILD_IN_SOURCE 1
106-
BUILD_COMMAND cargo build --release --all --all-features --target ${RUST_TARGET}
106+
BUILD_COMMAND cargo build --release --manifest-path ffi/Cargo.toml --features ffi-headers --target ${RUST_TARGET}
107107
INSTALL_COMMAND "")
108108
ExternalProject_Get_Property(libloadorder SOURCE_DIR)
109109
set(LIBLOADORDER_INCLUDE_DIRS "${SOURCE_DIR}/ffi/include")

0 commit comments

Comments
 (0)