diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa6fc1290..3a72a1b8c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,12 @@ project(lokinet
DESCRIPTION "lokinet - IP packet onion router"
LANGUAGES ${LANGS})
+if(APPLE)
+ # Apple build number: must be incremented to submit a new build for the same lokinet version,
+ # should be reset to 0 when the lokinet version increments.
+ set(LOKINET_APPLE_BUILD 0)
+endif()
+
set(RELEASE_MOTTO "A Series of Tubes" CACHE STRING "Release motto")
add_definitions(-DLLARP_VERSION_MAJOR=${lokinet_VERSION_MAJOR})
diff --git a/contrib/macos/Info.plist b/contrib/macos/Info.plist.in
similarity index 87%
rename from contrib/macos/Info.plist
rename to contrib/macos/Info.plist.in
index d39aed3a8..5e09e839b 100644
--- a/contrib/macos/Info.plist
+++ b/contrib/macos/Info.plist.in
@@ -17,8 +17,8 @@
CFBundlePackageType
XPC!
CFBundleShortVersionString
- 0.1
+ @LOKINET_VERSION@
CFBundleVersion
- 0.1
+ @LOKINET_VERSION@.@LOKINET_APPLE_BUILD@
diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index 39f1b1acd..724c14513 100644
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -97,7 +97,7 @@ if(APPLE)
MACOSX_BUNDLE_LONG_VERSION_STRING "${lokinet_VERSION}"
MACOSX_BUNDLE_SHORT_VERSION_STRING "${lokinet_VERSION_MAJOR}.${lokinet_VERSION_MINOR}"
MACOSX_BUNDLE_GUI_IDENTIFIER "com.loki-project.lokinet"
- MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/contrib/macos/Info.plist"
+ MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/contrib/macos/Info.plist.in"
MACOSX_BUNDLE_ICON_FILE "${CMAKE_CURRENT_BINARY_DIR}/lokinet.icns"
MACOSX_BUNDLE_COPYRIGHT "© 2021, The Oxen Project")
if (CODESIGN_KEY)
diff --git a/llarp/CMakeLists.txt b/llarp/CMakeLists.txt
index a561cec07..ba47b0e68 100644
--- a/llarp/CMakeLists.txt
+++ b/llarp/CMakeLists.txt
@@ -280,14 +280,11 @@ if(APPLE)
${COREFOUNDATION}
${NETEXT})
- configure_file(${PROJECT_SOURCE_DIR}/contrib/macos/LokinetExtension.Info.plist.in
- ${CMAKE_CURRENT_BINARY_DIR}/LokinetExtension.Info.plist @ONLY)
-
set_target_properties(lokinet-extension PROPERTIES
FRAMEWORK TRUE
FRAMEWORK_VERSION ${lokinet_VERSION}
MACOSX_FRAMEWORK_IDENTIFIER com.loki-project.lokinet.network-extension
- MACOSX_FRAMEWORK_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/LokinetExtension.Info.plist
+ MACOSX_FRAMEWORK_INFO_PLIST ${PROJECT_SOURCE_DIR}/contrib/macos/LokinetExtension.Info.plist.in
# "current version" in semantic format in Mach-O binary file
VERSION ${lokinet_VERSION}
# "compatibility version" in semantic format in Mach-O binary file