mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 07:00:43 +00:00
22 lines
816 B
Diff
22 lines
816 B
Diff
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -25,6 +25,8 @@
|
||
|
|
# Packagers (or people using make install) have to set this variable to an absolute path.
|
||
|
|
wl_set_if_unset(WL_INSTALL_DATADIR "./data")
|
||
|
|
|
||
|
|
+wl_set_if_unset(WL_INSTALL_BINARY "./bin")
|
||
|
|
+
|
||
|
|
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||
|
|
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
|
||
|
|
message(FATAL_ERROR "Widelands needs GCC >= 4.7 to compile.")
|
||
|
|
|
||
|
|
--- a/cmake/WlFunctions.cmake
|
||
|
|
+++ b/cmake/WlFunctions.cmake
|
||
|
|
@@ -276,5 +276,5 @@
|
||
|
|
|
||
|
|
#Quoting the CMake documentation on DESTINATION:
|
||
|
|
#"If a relative path is given it is interpreted relative to the value of CMAKE_INSTALL_PREFIX"
|
||
|
|
- install(TARGETS ${NAME} DESTINATION "." COMPONENT ExecutableFiles)
|
||
|
|
+ install(TARGETS ${NAME} DESTINATION ${WL_INSTALL_BINARY} COMPONENT ExecutableFiles)
|
||
|
|
endfunction()
|