language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-04 02:39:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix builds of applications using Slint via FetchContent (part 2)

Browse source 
Amend 8406e1050d by fixing the condition
to apply the install_name when the cache variable used to detect package
builds is defined, not _not_ defined.

cc #2075
This commit is contained in:
Simon Hausmann 2023-04-03 17:36:34 +02:00
parent ba793a8447
commit 13a5d3c5cd
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/cpp/CMakeLists.txt
View file

@ -33,7 +33,7 @@ corrosion_import_crate(MANIFEST_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../Cargo.to
# include the binary dir and thus our examples would have the correct rpath set, binaries
# outside (i.e. applications using Slint via FetchContent) would not and the BUILD_RPATH
# target property doesn't propagate :(
if (APPLE AND NOT DEFINED CACHE{SLINT_BUILD_TESTING})
if (APPLE AND DEFINED CACHE{SLINT_BUILD_TESTING})
# corrosion could provide the Cargo.toml package version as a CMake target property.
corrosion_add_target_local_rustflags(slint-cpp -Clink-arg=-Wl,-install_name,@rpath/libslint_cpp.dylib,-current_version,${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR},-compatibility_version,${PROJECT_VERSION_MAJOR}.0)
# Set this one to false again explicitely because Corrosion will starting setting this property to true by default.