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

fixing apple build bug


Signed-off-by: Mccaskey, Alex's avatarAlex McCaskey <mccaskeyaj@ornl.gov>
parent 967c8d6c
......@@ -90,6 +90,7 @@ ExternalProject_Add(xacc-core
-DCPPUS_INCLUDE_DIR=${CppMicroServices_INCLUDE_DIR}
-DCPPUS_LIBRARY_DIR=${CppMicroServices_LIBRARY_DIR}
-DCppRSDK_INCLUDE_DIR=${CppRSDK_INCLUDE_DIR}
-DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}
-DOPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR}
-DOPENSSL_LIBRARIES=${OPENSSL_LIBRARIES}
CMAKE_CACHE_ARGS -DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}
......
......@@ -52,12 +52,18 @@ file (GLOB SRC *.cpp program/*.cpp utils/*.cpp accelerator/remote/*.cpp)
set(CppUsLib CppMicroServicesd)
link_directories(${CPPUS_LIBRARY_DIR})
link_directories(${Boost_LIBRARY_DIR})
link_directories(${CMAKE_INSTALL_PREFIX}/lib)
add_library(${LIBRARY_NAME} SHARED ${SRC})
find_library(cppus_has_d_suffix CppMicroServicesd)
if (NOT cppus_has_d_suffix)
set(CppUsLib CppMicroServices)
endif()
if (APPLE)
set(OPENSSL_LIBRARIES "${OPENSSL_LIBRARIES};${OPENSSL_ROOT_DIR}/lib/libcrypto.dylib")
endif()
target_link_libraries(${LIBRARY_NAME} ${Boost_LIBRARIES} ${CppUsLib} ${OPENSSL_LIBRARIES} cpprest)
# Get the test files
......
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