Make the build CMake 2.6 compatible
Merge pull request #2306 from odcinek/development_cmake

Make the build CMake 2.6 compatible