old update
merge cmakelists