Poc 4 cmake fixes

Early in the root CMakeLists.txt, the target platform needs to be detected - then we need to consistently use the same conditional formats throughout all additional CMakeLists.txt