From 2b20dca06d5b8173871103c20dedc9207575cfab Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Sat, 1 Jul 2023 12:55:17 +0200
Subject: [PATCH] BUILD: Remove old amadeus-rs, we will use the new one from
the rust branch
---
CMakeLists.txt | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d921ea67..fa29aabe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -333,17 +333,17 @@ target_compile_options(lkt PRIVATE
set_directory_properties(PROPERTIES EP_PREFIX ${CMAKE_BINARY_DIR}/Rust)
-ExternalProject_Add(amadeus_rs
- DOWNLOAD_COMMAND ""
- CONFIGURE_COMMAND ""
- INSTALL_COMMAND ""
- SOURCE_DIR "${CMAKE_SOURCE_DIR}/src/rust/amadeus-rs"
- BUILD_COMMAND ${RUST_BUILD_CMD}
- COMMAND ${RUST_BUILD_CMD}
- BUILD_BYPRODUCTS "${CMAKE_SOURCE_DIR}/src/rust/target/${RUST_BUILD_TYPE}/amadeus"
- BUILD_ALWAYS 1
- BUILD_IN_SOURCE 1
-)
+# ExternalProject_Add(amadeus_rs
+# DOWNLOAD_COMMAND ""
+# CONFIGURE_COMMAND ""
+# INSTALL_COMMAND ""
+# SOURCE_DIR "${CMAKE_SOURCE_DIR}/src/rust/amadeus-rs"
+# BUILD_COMMAND ${RUST_BUILD_CMD}
+# COMMAND ${RUST_BUILD_CMD}
+# BUILD_BYPRODUCTS "${CMAKE_SOURCE_DIR}/src/rust/target/${RUST_BUILD_TYPE}/amadeus"
+# BUILD_ALWAYS 1
+# BUILD_IN_SOURCE 1
+# )
ExternalProject_Add(liblektor_rs
DOWNLOAD_COMMAND ""
@@ -375,7 +375,7 @@ target_link_libraries(lektord
# 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
RUNTIME # For lektord
--
GitLab