Update installation in CMakeLists.txt
authorPerttu Ahola <celeron55@gmail.com>
Mon, 28 Nov 2011 19:14:55 +0000 (21:14 +0200)
committerPerttu Ahola <celeron55@gmail.com>
Tue, 29 Nov 2011 17:13:57 +0000 (19:13 +0200)
src/CMakeLists.txt

index 8c966a690a290ea1d3ffc5eaa52abccb99588e6a..b714e89f1fa06e684228086f521aae321967470b 100644 (file)
@@ -302,13 +302,15 @@ endif()
 #
 
 # Example configuration file
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION ${EXAMPLE_CONF_DIR})
+# NOTE: Install is handled elsewhere
+#install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION ${EXAMPLE_CONF_DIR})
 
 if(BUILD_CLIENT)
        install(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 
-       file(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/../data/textures/*.png")
-       install(FILES ${images} DESTINATION ${DATADIR}/textures)
+       #file(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/../data/textures/*.png")
+       #install(FILES ${images} DESTINATION ${DATADIR}/textures)
+       install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../data" DESTINATION ${DATADIR})
 
        if(USE_GETTEXT)
                foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})