Oblomov
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix to be able to build from dir different than source dir" 

This commit broke RUN_IN_PLACE
master
kwolekr 2013-04-07 01:30:06 -04:00
parent 8ec3fc35c6
commit fbf76184f0
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CMakeLists.txt
View File

@ -167,20 +167,15 @@ endif()
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/fonts" DESTINATION "${SHAREDIR}") install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/fonts" DESTINATION "${SHAREDIR}")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/README.txt" DESTINATION "${DOCDIR}") install(FILES "README.txt" DESTINATION "${DOCDIR}")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/doc/lua_api.txt" DESTINATION "${DOCDIR}") install(FILES "doc/lua_api.txt" DESTINATION "${DOCDIR}")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/doc/mapformat.txt" DESTINATION "${DOCDIR}") install(FILES "doc/mapformat.txt" DESTINATION "${DOCDIR}")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}") install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
if(UNIX) if(UNIX)
install(FILES install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6")
"${CMAKE_CURRENT_SOURCE_DIR}/doc/minetest.6" install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
"${CMAKE_CURRENT_SOURCE_DIR}/doc/minetestserver.6" install(FILES "misc/minetest-icon.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
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() endif()
# #

2
src/CMakeLists.txt
View File

@ -372,7 +372,7 @@ if(USE_CURL)
) )
endif(USE_CURL) endif(USE_CURL)
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/bin") set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
if(BUILD_CLIENT) if(BUILD_CLIENT)
add_executable(${PROJECT_NAME} ${minetest_SRCS}) add_executable(${PROJECT_NAME} ${minetest_SRCS})