From 7b325561f0a5a58d794176f13aba35114ead314a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Brammer?= <gbrammer@gmx.de>
Date: Wed, 12 Oct 2011 20:59:28 +0200
Subject: [PATCH] CMake: Remove now redundant code to pack c4groups during
 installation

---
 CMakeLists.txt | 42 +++++++++++-------------------------------
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d444f97fb..90f3f1d58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1231,14 +1231,6 @@ IF(NOT \${CONVERT_RESULT} EQUAL 0)
 ENDIF()
 ")
 
-# Remove previously installed data files
-FILE(GLOB OC_INSTALLED_DATA_FILES "${CMAKE_INSTALL_PREFIX}/share/openclonk/*.oc[dfgs]")
-install(CODE "
-FOREACH(CURRENT_FILE ${OC_INSTALLED_DATA_FILES})
-	FILE(REMOVE \${CURRENT_FILE})
-ENDFOREACH()
-")
-
 set(OC_C4GROUPS
 	Graphics.ocg
 	Material.ocg
@@ -1250,29 +1242,6 @@ set(OC_C4GROUPS
 	Tutorial.ocf
 )
 
-# Install new files
-install(DIRECTORY ${OC_C4GROUPS} DESTINATION share/openclonk)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/clonk.desktop DESTINATION share/applications)
-
-# Pack them
-install(CODE "
-FOREACH(CURRENT_FILE ${OC_C4GROUPS})
-	GET_FILENAME_COMPONENT(CURRENT_FILENAME \"\${CURRENT_FILE}\" NAME)
-	MESSAGE(\"Packing \${CURRENT_FILENAME}...\")
-	EXECUTE_PROCESS(COMMAND \"${CMAKE_CURRENT_BINARY_DIR}/c4group\" \"${CMAKE_INSTALL_PREFIX}/share/openclonk/\${CURRENT_FILENAME}\" \"-p\" RESULT_VARIABLE C4GROUP_RESULT)
-	IF(NOT \${C4GROUP_RESULT} EQUAL 0)
-		MESSAGE(SEND_ERROR \"Packing ${CURRENT_FILENAME} failed\")
-	ENDIF()
-ENDFOREACH()
-")
-
-# Install binaries
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/clonk ${CMAKE_CURRENT_BINARY_DIR}/c4group DESTINATION bin/)
-
-############################################################################
-# setup_openclonk.exe
-############################################################################
-
 get_target_property(C4GROUP_LOCATION c4group LOCATION)
 get_target_property(CLONK_LOCATION clonk LOCATION)
 foreach(group ${OC_C4GROUPS})
@@ -1293,6 +1262,17 @@ foreach(group ${OC_C4GROUPS})
 	endif()
 endforeach()
 
+# Install new files
+install(FILES ${OC_C4GROUPS} DESTINATION share/openclonk)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/clonk.desktop DESTINATION share/applications)
+
+# Install binaries
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/clonk ${CMAKE_CURRENT_BINARY_DIR}/c4group DESTINATION bin/)
+
+############################################################################
+# setup_openclonk.exe
+############################################################################
+
 find_program(MAKENSIS makensis PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS])
 
 string(REPLACE / \\ C4GROUP_LOCATION ${C4GROUP_LOCATION})