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
714b5037
Commit
714b5037
authored
Aug 31, 2017
by
Mccaskey, Alex
Browse files
fixing a few more cmake bugs
parent
13194abe
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
714b5037
...
...
@@ -30,7 +30,6 @@ ExternalProject_Add(cppmicroservices
CMAKE_ARGS -DCMAKE_CXX_FLAGS='-Wimplicit-fallthrough=0'
-DCMAKE_BUILD_TYPE=
${
CMAKE_BUILD_TYPE
}
-DCMAKE_CXX_COMPILER=
${
CMAKE_CXX_COMPILER
}
-DCMAKE_CXX_FLAGS=
${
CMAKE_CXX_FLAGS
}
INSTALL_COMMAND
${
CMAKE_MAKE_PROGRAM
}
install DESTDIR=
${
CMAKE_BINARY_DIR
}
/cppus_install
)
...
...
quantum/CMakeLists.txt
View file @
714b5037
...
...
@@ -21,6 +21,7 @@ if (MPI_FOUND)
message
(
STATUS
"FOUND MPI:
${
MPI_CXX_INCLUDE_PATH
}
AND
${
MPI_CXX_LIBRARIES
}
"
)
# We require Boost with MPI
find_package
(
Boost COMPONENTS mpi system program_options filesystem chrono thread REQUIRED
)
include_directories
(
${
MPI_CXX_INCLUDE_PATH
}
)
else
()
message
(
STATUS
"MPI Not Found."
)
...
...
@@ -35,7 +36,6 @@ include_directories(${Boost_INCLUDE_DIRS})
include_directories
(
${
XACC_ROOT
}
/tpls/spdlog
)
include_directories
(
${
XACC_ROOT
}
/tpls/eigen
)
include_directories
(
${
CPPUS_INCLUDE_DIR
}
)
include_directories
(
${
MPI_CXX_INCLUDE_PATH
}
)
include_directories
(
${
CMAKE_BINARY_DIR
}
)
link_directories
(
${
XACC_LIBRARY_DIR
}
)
...
...
xacc/CMakeLists.txt
View file @
714b5037
...
...
@@ -17,6 +17,7 @@ if (MPI_FOUND)
message
(
STATUS
"FOUND MPI:
${
MPI_CXX_INCLUDE_PATH
}
AND
${
MPI_CXX_LIBRARIES
}
"
)
# We require Boost with MPI
find_package
(
Boost COMPONENTS mpi system program_options filesystem chrono thread REQUIRED
)
include_directories
(
${
MPI_CXX_INCLUDE_PATH
}
)
else
()
message
(
STATUS
"MPI Not Found."
)
...
...
@@ -27,7 +28,6 @@ endif()
include_directories
(
${
Boost_INCLUDE_DIRS
}
)
include_directories
(
${
XACC_ROOT
}
/tpls/spdlog
)
include_directories
(
${
CPPUS_INCLUDE_DIR
}
)
include_directories
(
${
MPI_CXX_INCLUDE_PATH
}
)
include_directories
(
"
${
CMAKE_SOURCE_DIR
}
"
)
include_directories
(
"
${
CMAKE_SOURCE_DIR
}
/ir"
)
include_directories
(
"
${
CMAKE_SOURCE_DIR
}
/compiler"
)
...
...
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