Added FreeImage_LIBRARY to linker
Merge branch 'cmake'
Added better paths for source files
Merge branch 'cmake'
CMake reordering
Merge branch 'cmake'