diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2012-03-20 00:52:53 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-03-20 01:06:58 +0200 |
| commit | db4911f9565cae6d982e5fac2627fe45048fab8f (patch) | |
| tree | b8d72c6cf2290da16eb69d47b9aeb1785c1b17ce | |
| parent | 2a325de7aa943ea2a50cc4190b78c4a72529192d (diff) | |
| download | minetest-db4911f9565cae6d982e5fac2627fe45048fab8f.tar.gz minetest-db4911f9565cae6d982e5fac2627fe45048fab8f.tar.bz2 minetest-db4911f9565cae6d982e5fac2627fe45048fab8f.zip | |
Fix for MSVC and move stuff around a bit in CMakeLists.txt and src/CMakeLists.txt
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 257df6cec..c6f878823 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,8 +84,12 @@ elseif(UNIX) # Linux, BSD etc endif() endif() -install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builtin" DESTINATION "${SHAREDIR}/") -install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/mesetint" DESTINATION "${SHAREDIR}/games/") +install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builtin" DESTINATION "${SHAREDIR}") +install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/mesetint" DESTINATION "${SHAREDIR}/games") +if(BUILD_CLIENT) + #install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/sounds/base/pack" DESTINATION "${SHAREDIR}/sounds/base") + install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/textures/base/pack" DESTINATION "${SHAREDIR}/textures/base") +endif() install(FILES "README.txt" DESTINATION "${DOCDIR}") install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 16ab45c5c..b8f0341f0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -313,9 +313,6 @@ endif() if(BUILD_CLIENT) install(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR}) - #install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../sounds/base/pack" DESTINATION "${SHAREDIR}/sounds/base/") - install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../textures/base/pack" DESTINATION "${SHAREDIR}/textures/base/") - if(USE_GETTEXT) foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES}) set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE}) |