Commit 49cebb38 authored by Mccaskey, Alex's avatar Mccaskey, Alex
Browse files

building xacc-core with boost target bug


Signed-off-by: Mccaskey, Alex's avatarAlex McCaskey <mccaskeyaj@ornl.gov>
parent c3ddde2f
...@@ -109,7 +109,6 @@ ExternalProject_Add(boost ...@@ -109,7 +109,6 @@ ExternalProject_Add(boost
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
) )
set(BOOST_ROOT ${CMAKE_INSTALL_PREFIX}) set(BOOST_ROOT ${CMAKE_INSTALL_PREFIX})
endif()
ExternalProject_Add(xacc-core ExternalProject_Add(xacc-core
DEPENDS cppmicroservices restclient-cpp boost DEPENDS cppmicroservices restclient-cpp boost
...@@ -136,12 +135,34 @@ ExternalProject_Add(xacc-core ...@@ -136,12 +135,34 @@ ExternalProject_Add(xacc-core
INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} install # DESTDIR=${CMAKE_BINARY_DIR}/stage INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} install # DESTDIR=${CMAKE_BINARY_DIR}/stage
TEST_BEFORE_INSTALL 1 TEST_BEFORE_INSTALL 1
) )
else()
#set(XACC_BASE_DIR ${CMAKE_BINARY_DIR}/stage${CMAKE_INSTALL_PREFIX}) ExternalProject_Add(xacc-core
#set(XACC_INCLUDE_DIR ${XACC_BASE_DIR}/include/xacc) DEPENDS cppmicroservices restclient-cpp
#set(XACC_LIBRARY_DIR ${XACC_BASE_DIR}/lib) SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/xacc
#string (REPLACE ";" " " XACC_Boost_LIBRARIES "${Boost_LIBRARIES}") CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
#string (REPLACE ";" " " XACC_MPI_INCLUDE_PATHS "${MPI_CXX_INCLUDE_PATH}") -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-DBOOST_ROOT=${BOOST_ROOT}
-DXACC_ROOT=${CMAKE_CURRENT_SOURCE_DIR}
-DCPPUS_INCLUDE_DIR=${CppMicroServices_INCLUDE_DIR}
-DCPPUS_LIBRARY_DIR=${CppMicroServices_LIBRARY_DIR}
-DCppRSDK_INCLUDE_DIR=${CppRSDK_INCLUDE_DIR}
#-DXACC_HAS_PYTHON=${PYTHONLIBS_FOUND}
-DXACC_PYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}
-DXACC_PYTHON_LIBRARIES=${PYTHON_LIBRARIES}
-DPYBIND11_DIR=${CMAKE_SOURCE_DIR}/python/pybind11
# -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}
# -DOPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR}
# -DOPENSSL_LIBRARIES=${OPENSSL_LIBRARIES}
# -DOPENSSL_CRYPTO_LIBRARY=${OPENSSL_CRYPTO_LIBRARY}
CMAKE_CACHE_ARGS -DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}
BUILD_ALWAYS 1
INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} install # DESTDIR=${CMAKE_BINARY_DIR}/stage
TEST_BEFORE_INSTALL 1
)
endif()
ExternalProject_Add(xacc-quantum ExternalProject_Add(xacc-quantum
DEPENDS xacc-core DEPENDS xacc-core
......
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