oxen-io
/
lokinet
mirror of https://github.com/oxen-io/lokinet
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Jason Rhinelander 2023-01-06 16:28:22 -04:00 committed by dan
parent dc7f3cee22
commit 3d0fe8ecb7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/macos.cmake
View File

@ -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()

2
contrib/mac.sh
View File

@ -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"