From 046534e14bf95d7154b4c4217811de64dee1f8f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Mart=C3=ADnez?= Date: Fri, 5 Apr 2013 12:34:43 -0300 Subject: [PATCH] Fix to be able to build from dir different than source dir --- CMakeLists.txt | 19 ++++++++++++------- src/CMakeLists.txt | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ff44e9c2..124e68dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -167,15 +167,20 @@ endif() install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/fonts" DESTINATION "${SHAREDIR}") -install(FILES "README.txt" DESTINATION "${DOCDIR}") -install(FILES "doc/lua_api.txt" DESTINATION "${DOCDIR}") -install(FILES "doc/mapformat.txt" DESTINATION "${DOCDIR}") -install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/README.txt" DESTINATION "${DOCDIR}") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/doc/lua_api.txt" DESTINATION "${DOCDIR}") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/doc/mapformat.txt" DESTINATION "${DOCDIR}") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}") if(UNIX) - install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6") - install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}") - install(FILES "misc/minetest-icon.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps") + install(FILES + "${CMAKE_CURRENT_SOURCE_DIR}/doc/minetest.6" + "${CMAKE_CURRENT_SOURCE_DIR}/doc/minetestserver.6" + DESTINATION "${MANDIR}/man6") + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/misc/minetest.desktop" + DESTINATION "${XDG_APPS_DIR}") + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/misc/minetest-icon.svg" + DESTINATION "${ICONDIR}/hicolor/scalable/apps") endif() # diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1ed1c862..b951a826 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -371,7 +371,7 @@ if(USE_CURL) ) endif(USE_CURL) -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/bin") if(BUILD_CLIENT) add_executable(${PROJECT_NAME} ${minetest_SRCS})