Created
December 29, 2024 18:16
-
-
Save Lillecarl/b52631ba526fd111d48f7297a5401186 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/CMakeLists.txt b/CMakeLists.txt | |
index 496226e89..b2975c94d 100644 | |
--- a/CMakeLists.txt | |
+++ b/CMakeLists.txt | |
@@ -46,38 +46,6 @@ get_filename_component(REAL_CMAKE_SOURCE_DIR "${CMAKE_SOURCE_DIR}" REALPATH) | |
add_definitions(-DCMAKE_BINARY_DIR="${REAL_CMAKE_BINARY_DIR}") | |
add_definitions(-DCMAKE_SOURCE_DIR="${REAL_CMAKE_SOURCE_DIR}") | |
-# Define a function to build and link dependencies. | |
-function(CREATE_TARGET target) | |
- add_custom_target( | |
- ${target} ALL | |
- COMMAND | |
- "${CMAKE_COMMAND}" -E | |
- env ${VARS_FOR_CARGO} | |
- ${Rust_CARGO} | |
- build --bin ${target} | |
- $<$<CONFIG:Release>:--release> | |
- $<$<CONFIG:RelWithDebInfo>:--profile=release-with-debug> | |
- --target ${Rust_CARGO_TARGET} | |
- --no-default-features | |
- ${CARGO_FLAGS} | |
- ${FEATURES_ARG} | |
- && | |
- "${CMAKE_COMMAND}" -E | |
- copy "${rust_target_dir}/${rust_profile}/${target}" "${CMAKE_CURRENT_BINARY_DIR}" | |
- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" | |
- USES_TERMINAL | |
- ) | |
-endfunction(CREATE_TARGET) | |
- | |
-# Define fish. | |
-create_target(fish) | |
- | |
-# Define fish_indent. | |
-create_target(fish_indent) | |
- | |
-# Define fish_key_reader. | |
-create_target(fish_key_reader) | |
- | |
# Set up the docs. | |
include(cmake/Docs.cmake) | |
diff --git a/cmake/Install.cmake b/cmake/Install.cmake | |
index 2d8012c6d..ab9e2ba5c 100644 | |
--- a/cmake/Install.cmake | |
+++ b/cmake/Install.cmake | |
@@ -1,7 +1,5 @@ | |
set(CMAKE_INSTALL_MESSAGE NEVER) | |
-set(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fish ${CMAKE_CURRENT_BINARY_DIR}/fish_indent ${CMAKE_CURRENT_BINARY_DIR}/fish_key_reader) | |
- | |
set(prefix ${CMAKE_INSTALL_PREFIX}) | |
set(bindir ${CMAKE_INSTALL_BINDIR}) | |
set(sysconfdir ${CMAKE_INSTALL_SYSCONFDIR}) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment