widelands-dev team mailing list archive

[kaputtnik <somal@xxxxxxxx>]

The wrong building of the path appears also on linux. See diff comment.

With this change all works fine, imho. Haven't tested all use cases yet.

Diff comments:

> 
> === modified file 'CMakeLists.txt'
> --- CMakeLists.txt	2016-01-23 12:42:00 +0000
> +++ CMakeLists.txt	2016-01-28 17:26:34 +0000
> @@ -15,7 +17,13 @@
>  # (through config.h). If not specified, we are going to use the directory where
>  # the executable is in. Also on Linux.
>  # Packagers (or people using make install) have to set this variable to an absolute path.
> -wl_set_if_unset(WL_INSTALL_DATADIR ".")
> +wl_set_if_unset(WL_INSTALL_BASEDIR ".")
> +
> +# Define the directory structure for installation of the data files - will be hardcoded
> +# in WL bin (through config.h). If not specified, we are going to use the "data" directory
> +# below the directory where the executable is in. Also on Linux.
> +# Packagers (or people using make install) have to set this variable to an absolute path.
> +wl_set_if_unset(WL_INSTALL_DATADIR "./data/")
>  

Shouldn't this be "data/" instead of "./data/"?

>  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
>    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)


-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1397500.