From a91eb362777152b21dcd2c49788c1b5714f8792e Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Mon, 28 Nov 2011 21:14:55 +0200 Subject: [PATCH] Update installation in CMakeLists.txt --- src/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8c966a69..b714e89f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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})