diff -r 2e836bebb518 -r 453917e94e55 share/CMakeLists.txt --- a/share/CMakeLists.txt Wed Nov 14 00:23:29 2012 +0100 +++ b/share/CMakeLists.txt Thu Nov 22 00:41:53 2012 +0100 @@ -1,27 +1,23 @@ add_subdirectory(hedgewars) IF(APPLE OR CROSSAPPLE) - #needed for CFBundleVersion and CFBundleShortVersionString - FIND_PROGRAM(HGCOMMAND hg) - IF (HGCOMMAND AND (EXISTS ${CMAKE_SOURCE_DIR}/.hg)) - exec_program(${HGCOMMAND} - ARGS identify -n ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE version_suffix - ) - STRING(REGEX REPLACE "([0-9]+)(.*)" "\\1" version_suffix ${version_suffix}) - set (HEDGEWARS_REVISION ${version_suffix}) - 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(${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in - ${CMAKE_CURRENT_BINARY_DIR}/Info.plist) - install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/Info.plist" - DESTINATION ../) - install(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/Icon.icns" - DESTINATION ../Resources/) - install(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/hwico.icns" - DESTINATION ../Resources/) - install(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/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)