language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-01 22:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix cross-compiling with CMake

Browse source 
Select that the compiler and xtask should be compiled as host binaries,
not target.

This also pulls in new corrosion with better cross-compilation support.
This commit is contained in:
Simon Hausmann 2021-06-22 12:22:55 +02:00 • committed by Simon Hausmann
parent 9b4bcab926
commit 5fa7b31f01
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
api/sixtyfps-cpp/CMakeLists.txt
View file

@ -14,7 +14,7 @@ include(FetchContent)
FetchContent_Declare( FetchContent_Declare(
Corrosion Corrosion
GIT_REPOSITORY https://github.com/AndrewGaspar/corrosion.git GIT_REPOSITORY https://github.com/AndrewGaspar/corrosion.git
GIT_TAG 343546419f56f56780bd92f3fcd51fc02a598de6 GIT_TAG 5eb66cce63a0c936228cb03d95a6742423591ae1
) )
FetchContent_MakeAvailable(Corrosion) FetchContent_MakeAvailable(Corrosion)
corrosion_import_crate(MANIFEST_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../Cargo.toml" corrosion_import_crate(MANIFEST_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../Cargo.toml"
@ -41,6 +41,19 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.19.0)
endif() endif()
endif() endif()
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.19.0)
set_property(
TARGET xtask
PROPERTY CORROSION_USE_HOST_BUILD 1
)
set_property(
TARGET sixtyfps_compiler
PROPERTY CORROSION_USE_HOST_BUILD 1
)
elseif(CMAKE_CROSSCOMPILING)
message(FATAL_ERROR "Cross-compiling SixtyFPS requires CMake 3.19 or newer")
endif()
add_library(SixtyFPS INTERFACE) add_library(SixtyFPS INTERFACE)
add_library(SixtyFPS::SixtyFPS ALIAS SixtyFPS) add_library(SixtyFPS::SixtyFPS ALIAS SixtyFPS)
target_link_libraries(SixtyFPS INTERFACE sixtyfps-cpp) target_link_libraries(SixtyFPS INTERFACE sixtyfps-cpp)