Commit 40fb5aa5 authored by Mccaskey, Alex's avatar Mccaskey, Alex
Browse files

Fixing a few bugs

parent 895c493c
......@@ -140,7 +140,7 @@ install(FILES "${CMAKE_SOURCE_DIR}/cmake/Modules/tests.cmake" DESTINATION share/
INSTALL( DIRECTORY "${CMAKE_SOURCE_DIR}/tpls/spdlog" DESTINATION include )
INSTALL( DIRECTORY "${CMAKE_SOURCE_DIR}/tpls/eigen" DESTINATION include )
INSTALL( DIRECTORY "${CMAKE_SOURCE_DIR}/tpls/rapidjson" DESTINATION include )
install( DIRECTORY "${CMAKE_BINARY_DIR}/cppus_install/usr/local/bin/" DESTINATION bin)
install( DIRECTORY "${CMAKE_BINARY_DIR}/cppus_install/usr/local/bin/" DESTINATION bin PATTERN "bin/*" PERMISSIONS OWNER_EXECUTE)
install( DIRECTORY "${CMAKE_BINARY_DIR}/cppus_install/usr/local/include/" DESTINATION include)
install( DIRECTORY "${CMAKE_BINARY_DIR}/cppus_install/usr/local/lib/" DESTINATION lib)
install( DIRECTORY "${CMAKE_BINARY_DIR}/cppus_install/usr/local/share/" DESTINATION share)
......
set (XACC_ROOT "@CMAKE_INSTALL_PREFIX@")
set (XACC_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include/cppmicroservices3;@CMAKE_INSTALL_PREFIX@/include/xacc;@CMAKE_INSTALL_PREFIX@/include/quantum/gate;@CMAKE_INSTALL_PREFIX@/include/quantum/aqc;@CMAKE_INSTALL_PREFIX@/include/spdlog")
set (XACC_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/lib;@CMAKE_INSTALL_PREFIX@/lib/cppmicroservices")
set (XACC_LIBRARY_DIR "@CMAKE_INSTALL_PREFIX@/lib")
set (XACC_LIBRARIES "xacc;xacc-quantum-gate;xacc-quantum-aqc;CppMicroServicesd")
#@CMAKE_INSTALL_PREFIX@/lib/libxacc.so;@CMAKE_INSTALL_PREFIX@/lib/libxacc-quantum-gate.so;@CMAKE_INSTALL_PREFIX@/lib/libxacc-quantum-aqc.so;CppMicroServicesd")
#find_package(CppMicroServices NO_MODULE REQUIRED)
......@@ -103,7 +103,9 @@ protected:
itr != end_itr; ++itr) {
auto p = itr->path();
if ((p.extension() == ".so" || p.extension() == ".a")
&& (p.filename().string() != "libxacc.so")) {
&& (p.filename().string() != "libxacc.so")
&& !boost::contains(p.filename().string(), "libCppMicroServices")
&& !boost::contains(p.filename().string(), "libus")) {
context.InstallBundles(p.string());
}
}
......
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