Draft: Fix cmake threads

1. Store CMAKE_THREAD_LIBS_INIT in the cache file for integration with ICON.
2. Fix the -pthread problem when building with NAG.
3. A bit of clean-up and consistency.