[osx/build] Add the 2 entries for retina display + use template based…

… plist.info
mean00 · Jul 5, 2017 · 6b2b7f6 · 6b2b7f6
1 parent 97f139d
commit 6b2b7f6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/cmake/osx/Info.plist.in → avidemux/qt4/Info.plist.in b/cmake/osx/Info.plist.in → avidemux/qt4/Info.plist.in
@@ -5,23 +5,23 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleDisplayName</key>
-	<string>Avidemux2.6.app</string>
+	<string>Avidemux@S_VERSION@.app</string>
 	<key>CFBundleExecutable</key>
-	<string>Avidemux2.6.app</string>
+	<string>Avidemux@S_VERSION@.app</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Avidemux 2.6 Copyright 2001-2015 Mean</string>
+	<string>Avidemux @B_VERSION@ Copyright 2001-2015 Mean</string>
 	<key>CFBundleIconFile</key>
-	<string>appIcon.icns</string>
+	<string>avidemux.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>Avidemux.org</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Avidemux2.6.app</string>
+	<string>Avidemux@S_VERSION@.app</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>Avidemux 2.6.xx</string>
+	<string>Avidemux @B_VERSION@</string>
 	<key>CFBundleSignature</key>
 	<string>Avid</string>
 	<key>LSEnvironment</key>
@@ -35,7 +35,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<false/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Avidemux 2.6.x Copyright 2001-2015 Mean</string>
+	<string>Avidemux @B_VERSION@ Copyright 2001-2015 Mean</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

diff --git a/avidemux/qt4/adm_osx.cmake b/avidemux/qt4/adm_osx.cmake
@@ -11,11 +11,15 @@ MACRO(ADM_PREBUILD)
 ENDMACRO(ADM_PREBUILD)
 #
 MACRO(ADM_MAIN_APP)
+    SET(S_VERSION "${AVIDEMUX_MAJOR_MINOR}") # Short version
+    SET(B_VERSION "${AVIDEMUX_VERSION}") # Long version
+    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in ${CMAKE_BINARY_DIR}/Info.plist @ONLY)
     ADD_EXECUTABLE(avidemux3_${QT_EXTENSION}  MACOSX_BUNDLE ${ADM_EXE_SRCS})
-    set_property(TARGET avidemux3_${QT_EXTENSION} PROPERTY OUTPUT_NAME Avidemux${AVIDEMUX_MAJOR_MINOR})
+    SET_PROPERTY(TARGET avidemux3_${QT_EXTENSION} PROPERTY OUTPUT_NAME Avidemux${AVIDEMUX_MAJOR_MINOR})
     SET( MACOSX_BUNDLE_INFO_STRING "Avidemux - version ${AVIDEMUX_MAJOR_MINOR}" )
     SET( MACOSX_BUNDLE_BUNDLE_VERSION "${AVIDEMUX_MAJOR_MINOR}" )
     SET( MACOSX_BUNDLE_ICON_FILE avidemux.icns )
+    SET_PROPERTY(TARGET avidemux3_${QT_EXTENSION} PROPERTY   MACOSX_BUNDLE_INFO_PLIST ${CMAKE_BINARY_DIR}/Info.plist)
     SET_SOURCE_FILES_PROPERTIES(avidemux.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources )
     qt5_use_modules( avidemux3_${QT_EXTENSION}   Widgets Network)
     IF (USE_SDL)