Cmake 3.0 fix

Moved add_subdirectory to after if statement
Merge pull request #174 from rossmuir/MAID-511_Cmake_3_fix

Cmake 3.0 fix
Merge remote-tracking branch 'upstream/next' into MAID-432_boost_1_57