share/CMakeLists.txt
changeset 8093 2286a39140da
parent 8090 38d9cc60b14c
child 8096 453917e94e55
child 8146 1fba650c2aa4
--- a/share/CMakeLists.txt	Thu Nov 22 00:56:36 2012 +0400
+++ b/share/CMakeLists.txt	Wed Nov 21 23:34:54 2012 +0100
@@ -1,28 +1,23 @@
 add_subdirectory(hedgewars)
 
 IF(APPLE OR CROSSAPPLE)
-	#needed for CFBundleVersion and CFBundleShortVersionString
-	FIND_PROGRAM(HGCOMMAND hg)
-	IF (HGCOMMAND AND (EXISTS ${hedgewars_SOURCE_DIR}/.hg))
-            execute_process(COMMAND ${HGCOMMAND} identify -in
-                            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                            OUTPUT_VARIABLE internal_version
-                            ERROR_QUIET
-                        )
-		STRING(REGEX REPLACE "([0-9]+)(.*)" "\\1" revision_number ${internal_version})
-		set (HEDGEWARS_REVISION ${revision_number})
-	ELSE ()
-		set (HEDGEWARS_REVISION ${HEDGEWARS_VERSION})
-	ENDIF ()
+    #needed for CFBundleVersion and CFBundleShortVersionString
+        #should reuse the variables set in main CMakeLists.txt
+    IF(HGCOMMAND AND (EXISTS ${CMAKE_SOURCE_DIR}/.hg))
+        set(HEDGEWARS_REVISION ${revision_number})
+    ELSE()
+        set(HEDGEWARS_REVISION ${HEDGEWARS_VERSION})
+    ENDIF()
 
-	configure_file(${hedgewars_SOURCE_DIR}/share/Info.plist.in 
-		${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
-	install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/Info.plist"
-		DESTINATION ../)
-	install(PROGRAMS "${hedgewars_SOURCE_DIR}/share/Icon.icns"
-		DESTINATION ../Resources/)
-	install(PROGRAMS "${hedgewars_SOURCE_DIR}/share/hwico.icns"
-		DESTINATION ../Resources/)
-	install(PROGRAMS "${hedgewars_SOURCE_DIR}/share/dsa_pub.pem"
-		DESTINATION ../Resources/)
+    configure_file(${hedgewars_SOURCE_DIR}/share/Info.plist.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
+    #path here should be Hedgewars.app/Contents/MacOS
+    install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/Info.plist"
+            DESTINATION ../)
+    install(PROGRAMS "${hedgewars_SOURCE_DIR}/share/Icon.icns"
+            DESTINATION ../Resources/)
+    install(PROGRAMS "${hedgewars_SOURCE_DIR}/share/hwico.icns"
+            DESTINATION ../Resources/)
+    install(PROGRAMS "${hedgewars_SOURCE_DIR}/share/dsa_pub.pem"
+            DESTINATION ../Resources/)
 ENDIF(APPLE OR CROSSAPPLE)