Switched to CMake-Build-System