[mapserver-commits] [mapserver/mapserver] 3c10ad: Don't install mapserver target twice.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/mapserver/mapserver
  Commit: 3c10ad17cbd04998edf779c92f3be04a9bc3b460
      https://github.com/mapserver/mapserver/commit/3c10ad17cbd04998edf779c92f3be04a9bc3b460
  Author: Bas Couwenberg <sebastic at xs4all.nl>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M CMakeLists.txt

  Log Message:
  -----------
  Don't install mapserver target twice.

The mapserver target only needs to be installed when BUILD_DYNAMIC is true.

For convenience the mapserver_static target is assigned to the staticlib component.

This change also includes the ARCHIVE target from #5164.


  Commit: e3b1686d68893e74848baf842a44b5ccb9e7a9e8
      https://github.com/mapserver/mapserver/commit/e3b1686d68893e74848baf842a44b5ccb9e7a9e8
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M CMakeLists.txt

  Log Message:
  -----------
  Merge branch 'branch-7-0'


Compare: https://github.com/mapserver/mapserver/compare/2c127460520d...e3b1686d6889