[vz-dev] [volkszaehler/vzlogger] 4d5708: more fixes for cmake build without libsml

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/volkszaehler/vzlogger
  Commit: 4d5708e4c5470619e3307ead58febd7b44dd207a
      https://github.com/volkszaehler/vzlogger/commit/4d5708e4c5470619e3307ead58febd7b44dd207a
  Author: r00t- <r00t at constancy.org>
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Changed paths:
    M CMakeLists.txt
    M src/CMakeLists.txt
    M tests/CMakeLists.txt

  Log Message:
  -----------
  more fixes for cmake build without libsml


  Commit: a66adb7ab01aaae40bf40f8b541f57af3baa74b3
      https://github.com/volkszaehler/vzlogger/commit/a66adb7ab01aaae40bf40f8b541f57af3baa74b3
  Author: r00t- <r00t at constancy.org>
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Changed paths:
    M .travis.yml
    M CMakeLists.txt
    A gmock/CMakeLists.txt
    M include/Reading.hpp
    M include/api/Volkszaehler.hpp
    A include/gitSha1.h
    R modules/FindCurl.cmake
    A modules/GetGitRevisionDescription.cmake
    A modules/GetGitRevisionDescription.cmake.in
    M src/CMakeLists.txt
    M src/Reading.cpp
    A src/gitSha1.cpp.in
    M src/protocols/MeterFile.cpp
    M src/vzlogger.cpp
    M tests/CMakeLists.txt
    M tests/example_test.cpp
    A tests/main.cpp
    A tests/ut_MeterFile.cpp
    A tests/ut_api_volkszaehler.cpp

  Log Message:
  -----------
  fix merge conflict in tests/CMakeLists.txt


  Commit: 65b842db3f55ca9d05012bf7abc1941af02022ac
      https://github.com/volkszaehler/vzlogger/commit/65b842db3f55ca9d05012bf7abc1941af02022ac
  Author: r00t- <r00t at constancy.org>
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Changed paths:
    M tests/CMakeLists.txt

  Log Message:
  -----------
  skip MeterSML test if libsml not available


  Commit: caab7a746fd4d7bc52fc0a3c99bc067b6bb263de
      https://github.com/volkszaehler/vzlogger/commit/caab7a746fd4d7bc52fc0a3c99bc067b6bb263de
  Author: r00t- <r00t at constancy.org>
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Changed paths:
    M tests/CMakeLists.txt

  Log Message:
  -----------
  skip MeterSML test if libsml not available: fix warning


  Commit: 4fb556d219c09657bd118a45c7ba63f6aa2fd0ab
      https://github.com/volkszaehler/vzlogger/commit/4fb556d219c09657bd118a45c7ba63f6aa2fd0ab
  Author: r00t- <r00t at constancy.org>
  Date:   2015-01-06 (Tue, 06 Jan 2015)

  Changed paths:
    M tests/CMakeLists.txt

  Log Message:
  -----------
  skip MeterSML test if libsml not available: cmake glob returns full paths


  Commit: ffc6b5c02bd6b07865a37d092f9c47c6778cb696
      https://github.com/volkszaehler/vzlogger/commit/ffc6b5c02bd6b07865a37d092f9c47c6778cb696
  Author: andig <cpuidle at gmx.de>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M CMakeLists.txt
    M src/CMakeLists.txt
    M tests/CMakeLists.txt

  Log Message:
  -----------
  Merge pull request #101 from r00t-/fix_build_without_libsml

Fix build without libsml


Compare: https://github.com/volkszaehler/vzlogger/compare/1d272282c094...ffc6b5c02bd6