Commit f5f2d159 authored by Mccaskey, Alex's avatar Mccaskey, Alex
Browse files

minor bug fixes to the build


Signed-off-by: Mccaskey, Alex's avatarAlex McCaskey <mccaskeyaj@ornl.gov>
parent ec297ba0
...@@ -183,7 +183,11 @@ endif() ...@@ -183,7 +183,11 @@ endif()
configure_file("${CMAKE_SOURCE_DIR}/cmake/xacc-config.cmake.in" "${CMAKE_BINARY_DIR}/xacc-config.cmake" @ONLY) configure_file("${CMAKE_SOURCE_DIR}/cmake/xacc-config.cmake.in" "${CMAKE_BINARY_DIR}/xacc-config.cmake" @ONLY)
install(FILES "${CMAKE_BINARY_DIR}/xacc-config.cmake" DESTINATION .) install(FILES "${CMAKE_BINARY_DIR}/xacc-config.cmake" DESTINATION .)
install(FILES "${CMAKE_SOURCE_DIR}/cmake/Modules/tests.cmake" DESTINATION share/xacc/) install(FILES "${CMAKE_SOURCE_DIR}/cmake/Modules/tests.cmake" DESTINATION share/xacc/)
if(APPLE)
install(FILES ${CMAKE_BINARY_DIR}/lib/libcpr.dylib DESTINATION lib) install(FILES ${CMAKE_BINARY_DIR}/lib/libcpr.dylib DESTINATION lib)
else()
install(FILES ${CMAKE_BINARY_DIR}/lib/libcpr.so DESTINATION lib)
endif()
INSTALL( DIRECTORY "${CMAKE_SOURCE_DIR}/tpls/spdlog" DESTINATION include ) INSTALL( DIRECTORY "${CMAKE_SOURCE_DIR}/tpls/spdlog" DESTINATION include )
INSTALL( DIRECTORY "${CMAKE_SOURCE_DIR}/tpls/exprtk" DESTINATION include ) INSTALL( DIRECTORY "${CMAKE_SOURCE_DIR}/tpls/exprtk" DESTINATION include )
INSTALL( DIRECTORY "${CMAKE_SOURCE_DIR}/tpls/eigen" DESTINATION include ) INSTALL( DIRECTORY "${CMAKE_SOURCE_DIR}/tpls/eigen" DESTINATION include )
......
...@@ -173,6 +173,13 @@ void setOption(const std::string& optionKey, const std::string& value) { ...@@ -173,6 +173,13 @@ void setOption(const std::string& optionKey, const std::string& value) {
} }
} }
void unsetOption(const std::string& optionKey) {
if (optionExists(optionKey)) {
(*RuntimeOptions::instance()).erase(optionKey);
}
return;
}
void setCompiler(const std::string& compilerName) { void setCompiler(const std::string& compilerName) {
setOption("compiler", compilerName); setOption("compiler", compilerName);
} }
......
...@@ -168,6 +168,7 @@ const std::string getOption(const std::string& optionKey); ...@@ -168,6 +168,7 @@ const std::string getOption(const std::string& optionKey);
* @param value The new option value. * @param value The new option value.
*/ */
void setOption(const std::string& optionKey, const std::string& value); void setOption(const std::string& optionKey, const std::string& value);
void unsetOption(const std::string& optionKey);
/** /**
* Set the Compiler to use. * Set the Compiler to use.
...@@ -251,6 +252,10 @@ template<typename ServiceInterface> ...@@ -251,6 +252,10 @@ template<typename ServiceInterface>
std::vector<std::string> getRegisteredIds() { std::vector<std::string> getRegisteredIds() {
return serviceRegistry->getRegisteredIds<ServiceInterface>(); return serviceRegistry->getRegisteredIds<ServiceInterface>();
} }
template<typename ServiceInterface>
std::vector<std::shared_ptr<ServiceInterface>> getServices() {
return serviceRegistry->getServices<ServiceInterface>();
}
std::shared_ptr<IRTransformation> getIRTransformation(const std::string& name); std::shared_ptr<IRTransformation> getIRTransformation(const std::string& name);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment