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

update to support cmake_install_prefix != xacc_root 



Signed-off-by: Mccaskey, Alex's avatarAlex McCaskey <mccaskeyaj@ornl.gov>
parent 7fb54f26

CMakeLists.txt

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ option(QCOR_BUILD_TESTS "Build qcor tests" OFF) 
find_package(Clang 10.0.0 REQUIRED)

find_package(XACC REQUIRED)



configure_file("${CMAKE_SOURCE_DIR}/cmake/qcor_config.hpp.in"

               "${CMAKE_BINARY_DIR}/qcor_config.hpp")

install (FILES ${CMAKE_BINARY_DIR}/qcor_config.hpp DESTINATION include/qcor)



add_subdirectory(handlers)

add_subdirectory(runtime)

add_subdirectory(tools)

cmake/qcor_config.hpp.in

0 → 100644
+4 −0
Original line number Diff line number Diff line 
#pragma once



#define QCOR_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}"

#define XACC_ROOT "${XACC_ROOT}"

handlers/CMakeLists.txt

+3 −2
Original line number Diff line number Diff line
@@ -18,13 +18,14 @@ target_link_libraries(${LIBRARY_NAME} 


if(APPLE)

  set_target_properties(${LIBRARY_NAME}

                        PROPERTIES INSTALL_RPATH "@loader_path/../lib")

                        PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${XACC_ROOT}/lib;${LLVM_INSTALL_PREFIX}/lib")

  set_target_properties(${LIBRARY_NAME}

                        PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")

else()

  set_target_properties(${LIBRARY_NAME}

                        PROPERTIES INSTALL_RPATH "$ORIGIN/../lib:${LLVM_INSTALL_PREFIX}/lib")

                        PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib:${XACC_ROOT}/lib:${LLVM_INSTALL_PREFIX}/lib")

  set_target_properties(${LIBRARY_NAME} PROPERTIES LINK_FLAGS "-shared")

endif()





install(TARGETS ${LIBRARY_NAME} DESTINATION clang-plugins)

handlers/token_collector/CMakeLists.txt

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ add_library(${LIBRARY_NAME} 
            token_collector_util.cpp)



target_include_directories(${LIBRARY_NAME}

                           PUBLIC . 

                           PUBLIC . ${CMAKE_BINARY_DIR}

                                  ${CLANG_INCLUDE_DIRS}

                                  ${LLVM_INCLUDE_DIRS})
@@ -14,12 +14,12 @@ target_link_libraries(${LIBRARY_NAME} 


if(APPLE)

  set_target_properties(${LIBRARY_NAME}

                        PROPERTIES INSTALL_RPATH "@loader_path/../lib")

                        PROPERTIES INSTALL_RPATH "${XACC_ROOT}/lib;@loader_path")

  set_target_properties(${LIBRARY_NAME}

                        PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")

else()

  set_target_properties(${LIBRARY_NAME}

                        PROPERTIES INSTALL_RPATH "$ORIGIN/../lib")

                        PROPERTIES INSTALL_RPATH "${XACC_ROOT}/lib:$ORIGIN")

  set_target_properties(${LIBRARY_NAME} PROPERTIES LINK_FLAGS "-shared")

endif()

handlers/token_collector/staq/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -41,12 +41,12 @@ usfunctionembedresources(TARGET 


if(APPLE)

  set_target_properties(${LIBRARY_NAME}

                        PROPERTIES INSTALL_RPATH "@loader_path/../lib;${LLVM_INSTALL_PREFIX}/lib")

                        PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${XACC_ROOT}/lib;${LLVM_INSTALL_PREFIX}/lib")

  set_target_properties(${LIBRARY_NAME}

                        PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")

else()

  set_target_properties(${LIBRARY_NAME}

                        PROPERTIES INSTALL_RPATH "$ORIGIN/../lib:${LLVM_INSTALL_PREFIX}/lib")

                        PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib:${XACC_ROOT}/lib:${LLVM_INSTALL_PREFIX}/lib")

  set_target_properties(${LIBRARY_NAME} PROPERTIES LINK_FLAGS "-shared")

endif()