Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
CaosDB Octave library
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
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
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
caosdb
Software
CaosDB Octave library
Commits
5ec4ee5b
Commit
5ec4ee5b
authored
3 years ago
by
Daniel Hornung
Browse files
Options
Downloads
Patches
Plain Diff
ENH: Very basic functionality added.
parent
63fb5c3b
No related branches found
No related tags found
1 merge request
!1
Initial functionality
Pipeline
#11107
failed
3 years ago
Stage: setup
Stage: test
Stage: deploy
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+1
-1
1 addition, 1 deletion
CHANGELOG.md
CMakeLists.txt
+6
-6
6 additions, 6 deletions
CMakeLists.txt
src/lib/maoxdb.cpp
+1
-1
1 addition, 1 deletion
src/lib/maoxdb.cpp
with
8 additions
and
8 deletions
C
hangeLog
→
C
HANGELOG.md
+
1
−
1
View file @
5ec4ee5b
...
@@ -23,4 +23,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
...
@@ -23,4 +23,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added ###
### Added ###
-
Everything
.
-
Proof of concept with basic connection functionality
.
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
6
−
6
View file @
5ec4ee5b
...
@@ -65,11 +65,11 @@ execute_process(COMMAND mkoctfile -p OCTINCLUDEDIR
...
@@ -65,11 +65,11 @@ execute_process(COMMAND mkoctfile -p OCTINCLUDEDIR
string
(
REGEX REPLACE
"
\n
"
""
OCTINCLUDEDIR
"
${
OCTINCLUDEDIR
}
"
)
string
(
REGEX REPLACE
"
\n
"
""
OCTINCLUDEDIR
"
${
OCTINCLUDEDIR
}
"
)
set
(
MAOXDB_DIR
"
${
PROJECT_SOURCE_DIR
}
/src/lib"
)
set
(
MAOXDB_DIR
"
${
PROJECT_SOURCE_DIR
}
/src/lib"
)
add_library
(
maoxdb STATIC
"
${
MAOXDB_DIR
}
/test.cpp"
)
add_library
(
maoxdb STATIC
"
${
MAOXDB_DIR
}
/test.cpp"
"
${
MAOXDB_DIR
}
/maoxdb.cpp"
)
set_target_properties
(
maoxdb PROPERTIES PUBLIC_HEADER
"
${
MAOXDB_DIR
}
/maoxdb.hpp"
)
set_target_properties
(
maoxdb PROPERTIES PUBLIC_HEADER
"
${
MAOXDB_DIR
}
/maoxdb.hpp"
)
message
(
STATUS
"-----
\n
${
FLAGS_MEX_I
}
"
)
target_compile_options
(
maoxdb PRIVATE
"-I
${
OCTINCLUDEDIR
}
"
)
target_compile_options
(
maoxdb PRIVATE
"-I
${
OCTINCLUDEDIR
}
"
)
get_property
(
_MAOX_LIB_DIR TARGET maoxdb PROPERTY LIBRARY_OUTPUT_DIRECTORY
)
# message("_MAOX_LIB_DIR: ${_MAOX_LIB_DIR}")
#######################################################
#######################################################
### Compile into *.mex files
### Compile into *.mex files
...
@@ -83,8 +83,8 @@ file(MAKE_DIRECTORY ${PKG_INST_DIR})
...
@@ -83,8 +83,8 @@ file(MAKE_DIRECTORY ${PKG_INST_DIR})
# Options for mex compilation
# Options for mex compilation
string
(
REGEX REPLACE
";"
";-I"
_MKOCTFILE_INCLUDES
"-I
${
CONAN_INCLUDE_DIRS
}
;
${
MAOXDB_DIR
}
"
)
string
(
REGEX REPLACE
";"
";-I"
_MKOCTFILE_INCLUDES
"-I
${
CONAN_INCLUDE_DIRS
}
;
${
MAOXDB_DIR
}
"
)
string
(
REGEX REPLACE
";"
";-L"
_MKOCTFILE_LIB_DIRS
"-L
${
CONAN_LIB_DIRS
}
;
-L;
${
MAOX
D
B_DIR
}
"
)
string
(
REGEX REPLACE
";"
";-L"
_MKOCTFILE_LIB_DIRS
"-L
${
CONAN_LIB_DIRS
}
;
${
_
MAOX
_LI
B_DIR
}
"
)
string
(
REGEX REPLACE
";"
";-l"
_MKOCTFILE_LIBS
"-l
${
CONAN_LIBS
}
"
)
string
(
REGEX REPLACE
";"
";-l"
_MKOCTFILE_LIBS
"-l
${
CONAN_LIBS
}
;maoxdb
"
)
string
(
REGEX REPLACE
";"
":"
_MKOCTFILE_RPATH
"
${
CONAN_LIB_DIRS
}
"
)
string
(
REGEX REPLACE
";"
":"
_MKOCTFILE_RPATH
"
${
CONAN_LIB_DIRS
}
"
)
set
(
_MKOCTFILE_OPTIONS
"-Wl,-rpath,
${
_MKOCTFILE_RPATH
}
"
"--mex"
"-std=gnu++17"
set
(
_MKOCTFILE_OPTIONS
"-Wl,-rpath,
${
_MKOCTFILE_RPATH
}
"
"--mex"
"-std=gnu++17"
"-L/usr/local/lib"
${
_MKOCTFILE_INCLUDES
}
${
_MKOCTFILE_LIB_DIRS
}
${
_MKOCTFILE_LIBS
}
)
"-L/usr/local/lib"
${
_MKOCTFILE_INCLUDES
}
${
_MKOCTFILE_LIB_DIRS
}
${
_MKOCTFILE_LIBS
}
)
...
@@ -96,7 +96,7 @@ foreach(sourcefile ${_CPP_SOURCES})
...
@@ -96,7 +96,7 @@ foreach(sourcefile ${_CPP_SOURCES})
string
(
REGEX REPLACE
".cpp$"
".mex"
_mex_ext_file
${
sourcefile
}
)
string
(
REGEX REPLACE
".cpp$"
".mex"
_mex_ext_file
${
sourcefile
}
)
string
(
REGEX REPLACE
"/"
"__"
_target_name
"
${
sourcefile
}
"
)
string
(
REGEX REPLACE
"/"
"__"
_target_name
"
${
sourcefile
}
"
)
set
(
_mex_ext_file
"
${
PKG_INST_DIR
}
/
${
_mex_ext_file
}
"
)
set
(
_mex_ext_file
"
${
PKG_INST_DIR
}
/
${
_mex_ext_file
}
"
)
set
(
_mkoct_output
"-o
"
"
${
_mex_ext_file
}
"
)
set
(
_mkoct_output
"-o
;
${
_mex_ext_file
}
"
)
set
(
_abs_source
"
${
PROJECT_SOURCE_DIR
}
/src/
${
sourcefile
}
"
)
set
(
_abs_source
"
${
PROJECT_SOURCE_DIR
}
/src/
${
sourcefile
}
"
)
add_custom_command
(
OUTPUT
${
_mex_ext_file
}
add_custom_command
(
OUTPUT
${
_mex_ext_file
}
COMMAND mkoctfile
COMMAND mkoctfile
...
...
This diff is collapsed.
Click to expand it.
src/lib/maoxdb.cpp
+
1
−
1
View file @
5ec4ee5b
...
@@ -47,7 +47,7 @@ std::pair<string, string> exceptionToMessage(const caosdb::exceptions::Exception
...
@@ -47,7 +47,7 @@ std::pair<string, string> exceptionToMessage(const caosdb::exceptions::Exception
*/
*/
void
throwOctException
(
const
caosdb
::
exceptions
::
Exception
&
exc
)
{
void
throwOctException
(
const
caosdb
::
exceptions
::
Exception
&
exc
)
{
std
::
pair
<
string
,
string
>
excContent
=
exceptionToMessage
(
exc
);
std
::
pair
<
string
,
string
>
excContent
=
exceptionToMessage
(
exc
);
mexErrMsgIdAndTxt
(
excContent
.
first
,
excContent
.
second
);
mexErrMsgIdAndTxt
(
excContent
.
first
.
c_str
()
,
excContent
.
second
.
c_str
()
);
}
}
}
}
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