[patch] patch to fix smake issues (save as cmake_install.patch in files)

cmake_install.patch (text/plain), 2.65 KB, created by Nuno on 2011-10-05 11:29:14 UTC

--- cmake_install.cmake	2011-10-05 11:50:11.420163514 +0100
+++ cmake_install.cmake_old	2011-10-05 11:52:28.729850068 +0100
@@ -38,13 +38,11 @@
 
 IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
   
-EXECUTE_PROCESS(COMMAND "convert" "/var/tmp/portage/games-puzzle/openclonk-5.2.0/work/openclonk-release-5.2.0-src/src/res/oc.ico[2]" "/var/tmp/portage/games-puzzle/openclonk-5.2.0/work/openclonk-5.2.0_build/clonk.png" RESULT_VARIABLE CONVERT_RESULT)
+EXECUTE_PROCESS(COMMAND "convert" "/var/tmp/portage/games-puzzle/openclonk-5.2.0/work/openclonk-release-5.2.0-src/src/res/oc.ico[2]" "/usr/share/icons/hicolor/48x48/apps/clonk.png" RESULT_VARIABLE CONVERT_RESULT)
 IF(NOT ${CONVERT_RESULT} EQUAL 0)
 	MESSAGE(SEND_ERROR "Creating icon failed")
 ENDIF()
 
-FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps" TYPE FILE FILES "/var/tmp/portage/games-puzzle/openclonk-5.2.0/work/openclonk-5.2.0_build/clonk.png")
-
 ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
 
 IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
@@ -78,7 +76,7 @@
 FOREACH(CURRENT_FILE /var/tmp/portage/games-puzzle/openclonk-5.2.0/work/openclonk-release-5.2.0-src/planet/Music.ocg;/var/tmp/portage/games-puzzle/openclonk-5.2.0/work/openclonk-release-5.2.0-src/planet/Graphics.ocg;/var/tmp/portage/games-puzzle/openclonk-5.2.0/work/openclonk-release-5.2.0-src/planet/Objects.ocd;/var/tmp/portage/games-puzzle/openclonk-5.2.0/work/openclonk-release-5.2.0-src/planet/Tests.ocf;/var/tmp/portage/games-puzzle/openclonk-5.2.0/work/openclonk-release-5.2.0-src/planet/Tutorial.ocf;/var/tmp/portage/games-puzzle/openclonk-5.2.0/work/openclonk-release-5.2.0-src/planet/BackToTheRocks.ocf;/var/tmp/portage/games-puzzle/openclonk-5.2.0/work/openclonk-release-5.2.0-src/planet/System.ocg;/var/tmp/portage/games-puzzle/openclonk-5.2.0/work/openclonk-release-5.2.0-src/planet/Material.ocg;/var/tmp/portage/games-puzzle/openclonk-5.2.0/work/openclonk-release-5.2.0-src/planet/Sound.ocg)
 	GET_FILENAME_COMPONENT(CURRENT_FILENAME "${CURRENT_FILE}" NAME)
 	MESSAGE("Packing ${CURRENT_FILENAME}...")
-	EXECUTE_PROCESS(COMMAND "/var/tmp/portage/games-puzzle/openclonk-5.2.0/work/openclonk-5.2.0_build/c4group" "/var/tmp/portage/games-puzzle/openclonk-5.2.0/image/usr/share/openclonk/${CURRENT_FILENAME}" "-p" RESULT_VARIABLE C4GROUP_RESULT)
+	EXECUTE_PROCESS(COMMAND "/var/tmp/portage/games-puzzle/openclonk-5.2.0/work/openclonk-5.2.0_build/c4group" "/usr/share/openclonk/${CURRENT_FILENAME}" "-p" RESULT_VARIABLE C4GROUP_RESULT)
 	IF(NOT ${C4GROUP_RESULT} EQUAL 0)
 		MESSAGE(SEND_ERROR "Packing  failed")
 	ENDIF()