Skip to content

Replaced armadillo files by submodule #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replaced armadillo files by submodule #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@
[submodule "tpls/eigen"]
path = tpls/eigen
url = https://gitlab.com/libeigen/eigen.git
[submodule "tpls/armadillo"]
path = tpls/armadillo
url = https://gitlab.com/conradsnicta/armadillo-code.git
2 changes: 1 addition & 1 deletion quantum/observable/pauli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ usFunctionGenerateBundleInit(TARGET ${LIBRARY_NAME} OUT SRC)
add_library(${LIBRARY_NAME} SHARED ${SRC})
target_include_directories(${LIBRARY_NAME}
PUBLIC
. ${CMAKE_SOURCE_DIR}/tpls/armadillo
. ${CMAKE_SOURCE_DIR}/tpls/armadillo/include
${CMAKE_SOURCE_DIR}/tpls/antlr/runtime/src
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/generated
Expand Down
2 changes: 1 addition & 1 deletion quantum/plugins/optimizers/mlpack/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ add_library(${LIBRARY_NAME} SHARED ${SRC})

target_include_directories(${LIBRARY_NAME}
PUBLIC . ${CMAKE_SOURCE_DIR}/tpls/ensmallen
${CMAKE_SOURCE_DIR}/tpls/armadillo)
${CMAKE_SOURCE_DIR}/tpls/armadillo/include)

if(LAPACK_FOUND)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAS_LAPACK")
Expand Down
1 change: 1 addition & 0 deletions tpls/armadillo
Open in desktop
Submodule armadillo added at 40d2d9
Loading