Manual cleanup of cmake code:

Use variables CMAKE_INTEL and CMAKE_SPARC to test for Solaris features.

Change-Id: Ic1c75faa4754269b169adcd55c5e98643aa525a6