Skip to content
Extraits de code Groupes Projets
Vérifiée Valider 1b213e47 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

CMAKE: Add a way to override the cargo path

parent 93961e29
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!194WINDOW: use mpv_observe_property for deprecated MPV_EVENTs
......@@ -31,7 +31,7 @@
- ./rustup.sh -y --default-toolchain beta
- source ~/.cargo/env
script:
- cmake -Bbuild -DCMAKE_C_COMPILER=${c_compiler} -DCMAKE_CXX_COMPILER=${cxx_compiler} && make -Cbuild
- cmake -Bbuild -DCMAKE_RUST_COMPILER=~/.cargo/bin/cargo -DCMAKE_C_COMPILER=${c_compiler} -DCMAKE_CXX_COMPILER=${cxx_compiler} && make -Cbuild
variables:
GIT_DEPTH: 3 # No need to clone all the history
......
......@@ -111,6 +111,13 @@ find_program(MKVPROPEDIT mkvpropedit REQUIRED) # To DL karas and apply metadat
find_program(XXD xxd REQUIRED) # To embed the sqlite db schemas into the binary
find_program(CARGO cargo REQUIRED) # For rust things
if(CMAKE_RUST_COMPILER)
message(STATUS "Override cargo path: ${CMAKE_RUST_COMPILER}")
set(CARGO "${CMAKE_RUST_COMPILER}")
else()
message(STATUS "Using cargo: ${CARGO}")
endif()
message(STATUS "The installation prefix is ${CMAKE_INSTALL_PREFIX}")
TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter