Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nheko
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nheko Reborn
nheko
Commits
f9a662f7
Commit
f9a662f7
authored
7 years ago
by
Konstantinos Sideris
Browse files
Options
Downloads
Patches
Plain Diff
Specify install directory & arch for the matrix_structs library
[ci skip]
parent
b00365f6
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
cmake/MatrixStructs.cmake
+15
-7
15 additions, 7 deletions
cmake/MatrixStructs.cmake
with
16 additions
and
8 deletions
CMakeLists.txt
+
1
−
1
View file @
f9a662f7
...
...
@@ -321,7 +321,7 @@ endif()
qt5_add_resources
(
LANG_QRC
${
_qrc
}
)
qt5_add_resources
(
QRC resources/res.qrc
)
set
(
COMMON_LIBS
matrix_structs
Qt5::Widgets Qt5::Network Qt5::Concurrent
)
set
(
COMMON_LIBS
${
MATRIX_STRUCTS_LIBRARY
}
Qt5::Widgets Qt5::Network Qt5::Concurrent
)
if
(
APPVEYOR_BUILD
)
set
(
NHEKO_LIBS
${
COMMON_LIBS
}
lmdb
)
...
...
This diff is collapsed.
Click to expand it.
cmake/MatrixStructs.cmake
+
15
−
7
View file @
f9a662f7
...
...
@@ -8,20 +8,28 @@ set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party)
set
(
MATRIX_STRUCTS_ROOT
${
THIRD_PARTY_ROOT
}
/matrix_structs
)
set
(
MATRIX_STRUCTS_INCLUDE_DIRS
${
MATRIX_STRUCTS_ROOT
}
/deps
)
set
(
MATRIX_STRUCTS_LIBRARY
${
MATRIX_STRUCTS_ROOT
}
/lib/
${
CMAKE_STATIC_LIBRARY_PREFIX
}
matrix_structs
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
)
include_directories
(
SYSTEM
${
MATRIX_STRUCTS_ROOT
}
/deps
)
include_directories
(
SYSTEM
${
MATRIX_STRUCTS_ROOT
}
/include
)
link_directories
(
${
MATRIX_STRUCTS_ROOT
}
/lib
)
ExternalProject_Add
(
MatrixStructs
GIT_REPOSITORY https://github.com/mujx/matrix-structs
GIT_TAG
83be1388e632a43f0570857cb79313c09fb3da0b
GIT_TAG
a1beea3b115f037e26c15f22ed911341b3893411
BUILD_IN_SOURCE 1
SOURCE_DIR
${
MATRIX_STRUCTS_ROOT
}
CONFIGURE_COMMAND
${
CMAKE_COMMAND
}
-DCMAKE_BUILD_TYPE=Release
${
MATRIX_STRUCTS_ROOT
}
CONFIGURE_COMMAND
${
CMAKE_COMMAND
}
-DCMAKE_BUILD_TYPE=Release
${
MATRIX_STRUCTS_ROOT
}
-DCMAKE_INSTALL_PREFIX=
${
MATRIX_STRUCTS_ROOT
}
-Ax64
BUILD_COMMAND
${
CMAKE_COMMAND
}
--build
${
MATRIX_STRUCTS_ROOT
}
--config Release
INSTALL_COMMAND
""
INSTALL_COMMAND
${
CMAKE_COMMAND
}
--build
${
MATRIX_STRUCTS_ROOT
}
--config Release
--target install
)
include_directories
(
SYSTEM
${
MATRIX_STRUCTS_ROOT
}
/deps
)
include_directories
(
SYSTEM
${
MATRIX_STRUCTS_ROOT
}
/include
)
link_directories
(
${
MATRIX_STRUCTS_ROOT
}
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment