Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mtxclient
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
mtxclient
Commits
2e9a3fe4
Commit
2e9a3fe4
authored
7 years ago
by
Konstantinos Sideris
Browse files
Options
Downloads
Patches
Plain Diff
Handle matrix-structs as an ExternalProject instead of a submodule
parent
2f861e36
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitmodules
+0
-3
0 additions, 3 deletions
.gitmodules
CMakeLists.txt
+2
-9
2 additions, 9 deletions
CMakeLists.txt
cmake/MatrixStructs.cmake
+27
-0
27 additions, 0 deletions
cmake/MatrixStructs.cmake
libs/matrix-structs
+0
-1
0 additions, 1 deletion
libs/matrix-structs
with
29 additions
and
13 deletions
.gitmodules
deleted
100644 → 0
+
0
−
3
View file @
2f861e36
[submodule "libs/matrix-structs"]
path = libs/matrix-structs
url = https://github.com/mujx/matrix-structs
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
2
−
9
View file @
2e9a3fe4
...
...
@@ -7,12 +7,6 @@ option(BUILD_LIB_EXAMPLES "Build examples" ON)
set
(
CMAKE_INCLUDE_CURRENT_DIR ON
)
if
(
NOT EXISTS
"
${
CMAKE_SOURCE_DIR
}
/libs/matrix-structs/.git"
)
message
(
WARNING
"The git submodules are not available."
)
message
(
STATUS
"Running git submodule update --init --recursive ..."
)
execute_process
(
COMMAND git submodule update --init --recursive
)
endif
()
if
(
CMAKE_CXX_COMPILER_ID MATCHES
"Clang"
OR CMAKE_CXX_COMPILER_ID MATCHES
"GNU"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
\
-std=c++1z \
...
...
@@ -67,11 +61,10 @@ include_directories(${Boost_INCLUDE_DIRS})
#
# matrix-structs
#
add_subdirectory
(
libs/matrix-structs
)
include_directories
(
${
matrix_structs_SOURCE_DIR
}
/include
)
include_directories
(
${
matrix_structs_SOURCE_DIR
}
/deps
)
include
(
${
CMAKE_SOURCE_DIR
}
/cmake/MatrixStructs.cmake
)
include_directories
(
src
)
include_directories
(
${
MATRIX_STRUCTS_INCLUDE_DIRS
}
)
set
(
SRC src/client.cpp src/utils.cpp
)
add_library
(
matrix_client
${
SRC
}
)
...
...
This diff is collapsed.
Click to expand it.
cmake/MatrixStructs.cmake
0 → 100644
+
27
−
0
View file @
2e9a3fe4
include
(
ExternalProject
)
#
# Build matrix-structs.
#
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
)
ExternalProject_Add
(
MatrixStructs
GIT_REPOSITORY https://github.com/mujx/matrix-structs
GIT_TAG 83be1388e632a43f0570857cb79313c09fb3da0b
BUILD_IN_SOURCE 1
SOURCE_DIR
${
MATRIX_STRUCTS_ROOT
}
CONFIGURE_COMMAND
${
CMAKE_COMMAND
}
-DCMAKE_BUILD_TYPE=Release
${
MATRIX_STRUCTS_ROOT
}
BUILD_COMMAND
${
CMAKE_COMMAND
}
--build
${
MATRIX_STRUCTS_ROOT
}
INSTALL_COMMAND
""
)
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.
matrix-structs
@
83be1388
Compare
83be1388
...
83be1388
Subproject commit 83be1388e632a43f0570857cb79313c09fb3da0b
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