From 3d0fe8ecb716b5e989aca340543756d2eb1e55f2 Mon Sep 17 00:00:00 2001 From: Jason Rhinelander Date: Fri, 6 Jan 2023 16:28:22 -0400 Subject: [PATCH] Rename 'package' target on macos to 'dmg' to avoid cpack conflict CLI11 uses cpack, which makes us fail to configure on macos because of the 'package' target. Renaming it to 'dmg' should avoid the conflict. --- cmake/macos.cmake | 2 +- contrib/mac.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/macos.cmake b/cmake/macos.cmake index 7510ba1fe..c72248359 100644 --- a/cmake/macos.cmake +++ b/cmake/macos.cmake @@ -150,7 +150,7 @@ if(BUILD_PACKAGE) "${lokinet_installer}" COMMAND ./seticon lokinet.icns "${lokinet_installer}.dmg" ) - add_custom_target(package DEPENDS "${lokinet_installer}.dmg") + add_custom_target(dmg DEPENDS "${lokinet_installer}.dmg") endif() diff --git a/contrib/mac.sh b/contrib/mac.sh index 0a51fe672..d6217d082 100755 --- a/contrib/mac.sh +++ b/contrib/mac.sh @@ -19,7 +19,7 @@ fi cd build-mac rm -rf Lokinet\ * -ninja -j${JOBS:-1} package +ninja -j${JOBS:-1} dmg cd .. echo -e "Build complete, your app is here:\n"