diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-11-28 21:14:55 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:57 +0200 |
| commit | a91eb362777152b21dcd2c49788c1b5714f8792e (patch) | |
| tree | 653541c06bef69f7e528c19e892f1597e7a5f4c6 | |
| parent | 026979e39d2eb3a776a16dbc8a0e18c47969b362 (diff) | |
| download | minetest-a91eb362777152b21dcd2c49788c1b5714f8792e.tar.gz minetest-a91eb362777152b21dcd2c49788c1b5714f8792e.tar.bz2 minetest-a91eb362777152b21dcd2c49788c1b5714f8792e.zip | |
Update installation in CMakeLists.txt
| -rw-r--r-- | src/CMakeLists.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8c966a690..b714e89f1 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}) |