More changes for allowing compilation on Unix systems via CMake.
Authored by: alebou 2013-12-03
Parent: [r705]
Child: [r707]