[Commits] [wesnoth/wesnoth] 6e0886: respect CMAKE_MODULE_PATH provided by user

GitHub noreply at github.com
Sun Apr 10 02:55:30 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 6e0886434556975a4c51d04c1929f6823b835203
      https://github.com/wesnoth/wesnoth/commit/6e0886434556975a4c51d04c1929f6823b835203
  Author: Boris Nagaev <bnagaev at gmail.com>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M CMakeLists.txt
    M doc/man/CMakeLists.txt
    M doc/manual/CMakeLists.txt

  Log Message:
  -----------
  respect CMAKE_MODULE_PATH provided by user

Cross-compiling to Windows with MXE [1] requires providing custom
CMAKE_MODULE_PATH variable for CMake:

$ cmake -DCMAKE_MODULE_PATH=/file/provided/by/mxe.cmake

As Wesnoth's CMakeLists.txt resets CMAKE_MODULE_PATH, the effect of
CMAKE_MODULE_PATH provided by MXE is disabled and the build fails
with linking errors [2].

This commit changes CMakeLists.txt to respect the value of
user provided CMAKE_MODULE_PATH, so both MXE and Wesnoth
customizations of CMake variables are applied.

[1] http://mxe.cc/
[2] https://gist.github.com/starius/abfb9033d92f21ef521d


  Commit: 94fc73fcde2f5138e814789b0408fc105186dd12
      https://github.com/wesnoth/wesnoth/commit/94fc73fcde2f5138e814789b0408fc105186dd12
  Author: Andreas <andreas at alternating.net>
  Date:   2016-04-10 (Sun, 10 Apr 2016)

  Changed paths:
    M CMakeLists.txt
    M doc/man/CMakeLists.txt
    M doc/manual/CMakeLists.txt

  Log Message:
  -----------
  Merge pull request #551 from starius/respect-user-cmake-module-path

respect CMAKE_MODULE_PATH provided by user


Compare: https://github.com/wesnoth/wesnoth/compare/f77b3d7a6fde...94fc73fcde2f


More information about the Commits mailing list