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

kaeza · kwolekr · commit 046534e14bf9 · 2013-04-06T12:31:12.000-04:00
diff --git 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
@@ -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})

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ if(USE_CURL)`
`371`	`371`	`)`
`372`	`372`	`endif(USE_CURL)`
`373`	`373`
`374`		`-set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")`
	`374`	`+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/bin")`
`375`	`375`
`376`	`376`	`if(BUILD_CLIENT)`
`377`	`377`	`add_executable(${PROJECT_NAME} ${minetest_SRCS})`