##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » SciQLOPCore
RSS
Added TimeSeries library...
jeandet -
r57:0093c733b640
parent child
Show More
Show file before | Show file after | Hide comments
@@ -0,0 +1,1
1 Subproject commit 30fe90fd45b3d7d830a7a9e75db6f3e9cdc5bb0b
Show file before | Show file after | Hide comments
@@ -4,3 +4,6
4 [submodule "external/catalogicpp"]
4 [submodule "external/catalogicpp"]
5 path = external/catalogicpp
5 path = external/catalogicpp
6 url = https://github.com/jeandet/catalogicpp
6 url = https://github.com/jeandet/catalogicpp
7 [submodule "external/TimeSeries"]
8 path = external/TimeSeries
9 url = https://github.com/jeandet/TimeSeries
Show file before | Show file after | Hide comments
@@ -33,16 +33,6 if(PyWrappers)
33 endif()
33 endif()
34 endif()
34 endif()
35
35
36 find_package(libcatalogs CONFIG QUIET)
37 if (NOT catalogs_FOUND)
38 if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/external/libcatalogs/CMakeLists.txt)
39 message("Init submodule libcatalogs")
40 execute_process(COMMAND git submodule init external/libcatalogs WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
41 execute_process(COMMAND git submodule update external/libcatalogs WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
42 endif()
43 add_subdirectory(external/libcatalogs)
44 endif()
45
46 find_package(catalogicpp CONFIG QUIET)
36 find_package(catalogicpp CONFIG QUIET)
47 if (NOT catalogicpp_FOUND)
37 if (NOT catalogicpp_FOUND)
48 if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/external/catalogicpp/CMakeLists.txt)
38 if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/external/catalogicpp/CMakeLists.txt)
@@ -53,6 +43,16 if (NOT catalogicpp_FOUND)
53 add_subdirectory(external/catalogicpp)
43 add_subdirectory(external/catalogicpp)
54 endif()
44 endif()
55
45
46 find_package(TimeSeries CONFIG QUIET)
47 if (NOT TimeSeries_FOUND)
48 if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/external/TimeSeries/CMakeLists.txt)
49 message("Init submodule TimeSeries")
50 execute_process(COMMAND git submodule init external/TimeSeries WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
51 execute_process(COMMAND git submodule update external/TimeSeries WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
52 endif()
53 add_subdirectory(external/TimeSeries)
54 endif()
55
56 macro(declare_test testname testexe sources libraries)
56 macro(declare_test testname testexe sources libraries)
57 add_executable(${testexe} ${sources})
57 add_executable(${testexe} ${sources})
58 target_link_libraries(${testexe} ${libraries})
58 target_link_libraries(${testexe} ${libraries})
@@ -177,7 +177,6 target_link_libraries(sciqlopcore PUBLIC
177
177
178 if(Catalog)
178 if(Catalog)
179 target_link_libraries(sciqlopcore PUBLIC
179 target_link_libraries(sciqlopcore PUBLIC
180 catalogs
181 CatalogiCpp
180 CatalogiCpp
182 )
181 )
183 endif()
182 endif()
Show file before | Show file after | Hide comments
@@ -1,1 +1,1
1 Subproject commit 6547208a6ef0692c8fa0431e651c919ada111f4e
1 Subproject commit 515e439a3023209e04a568b8a6bcafc45415a364
Show file before | Show file after | Hide comments
@@ -10,18 +10,18
10 #include <string>
10 #include <string>
11
11
12 #include <Catalogue/CatalogueController.h>
12 #include <Catalogue/CatalogueController.h>
13 #include <DBCatalogue.h>
13 //#include <DBCatalogue.h>
14 #include <DBEvent.h>
14 //#include <DBEvent.h>
15 #include <DBEventProduct.h>
15 //#include <DBEventProduct.h>
16
16
17
17
18 namespace py = pybind11;
18 namespace py = pybind11;
19
19
20 std::ostream& operator<<(std::ostream& os, const DBEvent& e)
20 //std::ostream& operator<<(std::ostream& os, const DBEvent& e)
21 {
21 //{
22 os << std::endl;
22 // os << std::endl;
23 return os;
23 // return os;
24 }
24 //}
25
25
26 #define JAVA_LIKE_PROPERTY(name, className) \
26 #define JAVA_LIKE_PROPERTY(name, className) \
27 .def_property("##name", &className::get##name, &className::set##name)
27 .def_property("##name", &className::get##name, &className::set##name)
General Comments 0
You need to be logged in to leave comments. Login now