[CMake] refactoring on review DAVAF-2534 (step 2)
[CMake] refactoring on review DAVAF-2534 (step 3)