Fix ompt issues (#591)

* Fix OMPT directory duplicate

* Avoid duplicate options in ConfigManager

Author: daboehme

src/caliper/ConfigManager.cpp

@@ -632,7 +632,15 @@ struct ConfigManager::Options::OptionsImpl
             }
         }
 
-        enabled_options = std::move(vec);
+        // make sure there are no duplicates, but keep entries in input order
+        std::vector<std::string> ret;
+        ret.reserve(vec.size());
+        for (auto it = vec.begin(); it != vec.end(); ++it) {
+            if (std::find(ret.begin(), ret.end(), *it) == ret.end())
+                ret.emplace_back(std::move(*it));
+        }
+
+        enabled_options = std::move(ret);
     }
 
     OptionsImpl(const OptionSpec& s, const arglist_t& a)

src/services/CMakeLists.txt

@@ -87,11 +87,6 @@ if (CALIPER_HAVE_LIBDW)
   add_subdirectory(symbollookup)
 endif()
 add_subdirectory(trace)
-# add_subdirectory(pattern)
-if (CALIPER_HAVE_OMPT)
-  add_subdirectory(ompt)
-endif()
-
 if (CALIPER_HAVE_OMPT)
   add_subdirectory(ompt)
 endif()