Cmake 3.0 fix

Moved add_subdirectory to after if statement