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

BUILD: Remove old amadeus-rs, we will use the new one from the rust branch

parent 587f871c
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Pipeline #3790 en échec
...@@ -333,17 +333,17 @@ target_compile_options(lkt PRIVATE ...@@ -333,17 +333,17 @@ target_compile_options(lkt PRIVATE
set_directory_properties(PROPERTIES EP_PREFIX ${CMAKE_BINARY_DIR}/Rust) set_directory_properties(PROPERTIES EP_PREFIX ${CMAKE_BINARY_DIR}/Rust)
ExternalProject_Add(amadeus_rs # ExternalProject_Add(amadeus_rs
DOWNLOAD_COMMAND "" # DOWNLOAD_COMMAND ""
CONFIGURE_COMMAND "" # CONFIGURE_COMMAND ""
INSTALL_COMMAND "" # INSTALL_COMMAND ""
SOURCE_DIR "${CMAKE_SOURCE_DIR}/src/rust/amadeus-rs" # SOURCE_DIR "${CMAKE_SOURCE_DIR}/src/rust/amadeus-rs"
BUILD_COMMAND ${RUST_BUILD_CMD} # BUILD_COMMAND ${RUST_BUILD_CMD}
COMMAND ${RUST_BUILD_CMD} # COMMAND ${RUST_BUILD_CMD}
BUILD_BYPRODUCTS "${CMAKE_SOURCE_DIR}/src/rust/target/${RUST_BUILD_TYPE}/amadeus" # BUILD_BYPRODUCTS "${CMAKE_SOURCE_DIR}/src/rust/target/${RUST_BUILD_TYPE}/amadeus"
BUILD_ALWAYS 1 # BUILD_ALWAYS 1
BUILD_IN_SOURCE 1 # BUILD_IN_SOURCE 1
) # )
ExternalProject_Add(liblektor_rs ExternalProject_Add(liblektor_rs
DOWNLOAD_COMMAND "" DOWNLOAD_COMMAND ""
...@@ -375,7 +375,7 @@ target_link_libraries(lektord ...@@ -375,7 +375,7 @@ target_link_libraries(lektord
# THE INSTALL DIRECTIVES # # THE INSTALL DIRECTIVES #
### ### ### ###
install(PROGRAMS "${CMAKE_SOURCE_DIR}/src/rust/target/${RUST_BUILD_TYPE}/amadeus" TYPE BIN) # install(PROGRAMS "${CMAKE_SOURCE_DIR}/src/rust/target/${RUST_BUILD_TYPE}/amadeus" TYPE BIN)
install(TARGETS lektord lkt install(TARGETS lektord lkt
RUNTIME # For lektord RUNTIME # For lektord
......
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