Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ORNL Quantum Computing Institute
xacc
Commits
0b66254a
Commit
0b66254a
authored
Mar 27, 2018
by
Mccaskey, Alex
Browse files
getting relocatable packaging working on mac
Signed-off-by:
Alex McCaskey
<
mccaskeyaj@ornl.gov
>
parent
c7723d24
Changes
4
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
0b66254a
...
@@ -19,6 +19,9 @@ message(STATUS "C++ version ${CXX_STANDARD} configured.")
...
@@ -19,6 +19,9 @@ message(STATUS "C++ version ${CXX_STANDARD} configured.")
# Make sure all build libraries have reference to their dependents
# Make sure all build libraries have reference to their dependents
set
(
CMAKE_INSTALL_RPATH
"
${
CMAKE_INSTALL_PREFIX
}
/lib"
)
set
(
CMAKE_INSTALL_RPATH
"
${
CMAKE_INSTALL_PREFIX
}
/lib"
)
set
(
CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE
)
set
(
CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE
)
if
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Darwin"
)
set
(
CMAKE_MACOSX_RPATH ON
)
endif
()
include
(
ExternalProject
)
include
(
ExternalProject
)
...
...
python/CMakeLists.txt
View file @
0b66254a
...
@@ -6,8 +6,11 @@ set(CMAKE_CXX_STANDARD 11)
...
@@ -6,8 +6,11 @@ set(CMAKE_CXX_STANDARD 11)
message
(
STATUS
"C++ version
${
CXX_STANDARD
}
configured."
)
message
(
STATUS
"C++ version
${
CXX_STANDARD
}
configured."
)
# Make sure all build libraries have reference to their dependents
# Make sure all build libraries have reference to their dependents
set
(
CMAKE_INSTALL_RPATH
"
${
CMAKE_INSTALL_PREFIX
}
/lib"
)
set
(
CMAKE_INSTALL_RPATH
"
${
CMAKE_INSTALL_PREFIX
}
/lib
;@loader_path@/lib
"
)
set
(
CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE
)
set
(
CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE
)
if
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Darwin"
)
set
(
CMAKE_MACOSX_RPATH ON
)
endif
()
#find_package(PythonLibs)
#find_package(PythonLibs)
#if(PythonLibs_FOUND)
#if(PythonLibs_FOUND)
...
@@ -50,6 +53,8 @@ if (NOT cppus_has_d_suffix)
...
@@ -50,6 +53,8 @@ if (NOT cppus_has_d_suffix)
endif
()
endif
()
target_link_libraries
(
pyxacc PRIVATE xacc xacc-quantum-gate xacc-quantum-aqc
${
CppUsLib
}
${
Boost_LIBRARIES
}
cpprest
${
OPENSSL_LIBRARIES
}
)
target_link_libraries
(
pyxacc PRIVATE xacc xacc-quantum-gate xacc-quantum-aqc
${
CppUsLib
}
${
Boost_LIBRARIES
}
cpprest
${
OPENSSL_LIBRARIES
}
)
set_target_properties
(
pyxacc PROPERTIES INSTALL_RPATH
"@loader_path/lib"
)
if
(
FROM_SETUP_PY
)
if
(
FROM_SETUP_PY
)
install
(
TARGETS pyxacc DESTINATION
${
CMAKE_INSTALL_PREFIX
}
)
install
(
TARGETS pyxacc DESTINATION
${
CMAKE_INSTALL_PREFIX
}
)
else
()
else
()
...
...
quantum/CMakeLists.txt
View file @
0b66254a
...
@@ -19,6 +19,9 @@ message(STATUS "C++ version ${CXX_STANDARD} configured.")
...
@@ -19,6 +19,9 @@ message(STATUS "C++ version ${CXX_STANDARD} configured.")
# Make sure all build libraries have reference to their dependents
# Make sure all build libraries have reference to their dependents
set
(
CMAKE_INSTALL_RPATH
"
${
CMAKE_INSTALL_PREFIX
}
/lib"
)
set
(
CMAKE_INSTALL_RPATH
"
${
CMAKE_INSTALL_PREFIX
}
/lib"
)
set
(
CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE
)
set
(
CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE
)
if
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Darwin"
)
set
(
CMAKE_MACOSX_RPATH ON
)
endif
()
set
(
CppMicroServices_DIR
"
${
CPPUS_LIBRARY_DIR
}
/../share/cppmicroservices3/cmake"
)
set
(
CppMicroServices_DIR
"
${
CPPUS_LIBRARY_DIR
}
/../share/cppmicroservices3/cmake"
)
...
...
xacc/CMakeLists.txt
View file @
0b66254a
...
@@ -17,6 +17,11 @@ set(CMAKE_STANDARD_REQUIRED ON)
...
@@ -17,6 +17,11 @@ set(CMAKE_STANDARD_REQUIRED ON)
set
(
CMAKE_CXX_STANDARD 11
)
set
(
CMAKE_CXX_STANDARD 11
)
message
(
STATUS
"C++ version
${
CXX_STANDARD
}
configured."
)
message
(
STATUS
"C++ version
${
CXX_STANDARD
}
configured."
)
set
(
CMAKE_INSTALL_RPATH
"
${
CMAKE_INSTALL_PREFIX
}
/lib"
)
set
(
CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE
)
if
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Darwin"
)
set
(
CMAKE_MACOSX_RPATH ON
)
endif
()
# Modify our CMAKE_MODULE_PATH
# Modify our CMAKE_MODULE_PATH
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
"
${
XACC_ROOT
}
/cmake/Modules"
)
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
"
${
XACC_ROOT
}
/cmake/Modules"
)
include
(
tests
)
include
(
tests
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment