ENH: Very basic functionality added.

ChangeLog → CHANGELOG.md

@@ -23,4 +23,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added ###
 
-- Everything.
+- Proof of concept with basic connection functionality.

CMakeLists.txt

@@ -65,11 +65,11 @@ execute_process(COMMAND mkoctfile -p OCTINCLUDEDIR
 string(REGEX REPLACE "\n" "" OCTINCLUDEDIR "${OCTINCLUDEDIR}")
 
 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")
-message(STATUS "-----\n${FLAGS_MEX_I}")
 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
@@ -83,8 +83,8 @@ file(MAKE_DIRECTORY ${PKG_INST_DIR})
 
 # Options for mex compilation
 string(REGEX REPLACE ";" ";-I" _MKOCTFILE_INCLUDES "-I${CONAN_INCLUDE_DIRS};${MAOXDB_DIR}")
-string(REGEX REPLACE ";" ";-L" _MKOCTFILE_LIB_DIRS "-L${CONAN_LIB_DIRS};-L;${MAOXDB_DIR}")
-string(REGEX REPLACE ";" ";-l" _MKOCTFILE_LIBS "-l${CONAN_LIBS}")
+string(REGEX REPLACE ";" ";-L" _MKOCTFILE_LIB_DIRS "-L${CONAN_LIB_DIRS};${_MAOX_LIB_DIR}")
+string(REGEX REPLACE ";" ";-l" _MKOCTFILE_LIBS "-l${CONAN_LIBS};maoxdb")
 string(REGEX REPLACE ";" ":" _MKOCTFILE_RPATH "${CONAN_LIB_DIRS}")
 set(_MKOCTFILE_OPTIONS "-Wl,-rpath,${_MKOCTFILE_RPATH}" "--mex" "-std=gnu++17"
     "-L/usr/local/lib" ${_MKOCTFILE_INCLUDES} ${_MKOCTFILE_LIB_DIRS} ${_MKOCTFILE_LIBS})
@@ -96,7 +96,7 @@ foreach(sourcefile ${_CPP_SOURCES})
     string(REGEX REPLACE ".cpp$" ".mex" _mex_ext_file ${sourcefile})
     string(REGEX REPLACE "/" "__" _target_name "${sourcefile}")
     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}")
     add_custom_command(OUTPUT ${_mex_ext_file}
         COMMAND mkoctfile

src/lib/maoxdb.cpp

@@ -47,7 +47,7 @@ std::pair<string, string> exceptionToMessage(const caosdb::exceptions::Exception
  */
 void throwOctException(const caosdb::exceptions::Exception &exc) {
   std::pair<string, string> excContent = exceptionToMessage(exc);
-  mexErrMsgIdAndTxt(excContent.first, excContent.second);
+  mexErrMsgIdAndTxt(excContent.first.c_str(), excContent.second.c_str());
 }
 
 }