|
@@
-22,15
+22,21
find_package(Qt5 COMPONENTS Core Widgets Network PrintSupport Svg Test REQUIRED)
|
|
22
|
22
|
|
|
23
|
23
|
find_package(pybind11 CONFIG QUIET)
|
|
24
|
24
|
if (NOT pybind11_FOUND)
|
|
25
|
|
execute_process(COMMAND git submodule init external/pybind11 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
|
26
|
|
execute_process(COMMAND git submodule update external/pybind11 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
|
|
25
|
if(NOT IS_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/external/pybind11)
|
|
|
26
|
message("Init submodule pybind11")
|
|
|
27
|
execute_process(COMMAND git submodule init external/pybind11 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
|
|
28
|
execute_process(COMMAND git submodule update external/pybind11 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
|
|
29
|
endif()
|
|
27
|
30
|
add_subdirectory(external/pybind11)
|
|
28
|
31
|
endif()
|
|
29
|
32
|
|
|
30
|
33
|
find_package(libcatalogs CONFIG QUIET)
|
|
31
|
34
|
if (NOT catalogs_FOUND)
|
|
32
|
|
execute_process(COMMAND git submodule init external/libcatalogs WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
|
33
|
|
execute_process(COMMAND git submodule update external/libcatalogs WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
|
|
35
|
if(NOT IS_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/external/libcatalogs)
|
|
|
36
|
message("Init submodule libcatalogs")
|
|
|
37
|
execute_process(COMMAND git submodule init external/libcatalogs WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
|
|
38
|
execute_process(COMMAND git submodule update external/libcatalogs WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
|
|
39
|
endif()
|
|
34
|
40
|
add_subdirectory(external/libcatalogs)
|
|
35
|
41
|
endif()
|
|
36
|
42
|
|
|
@@
-67,9
+73,9
FILE (GLOB_RECURSE core_SRCS
|
|
67
|
73
|
./include/Data/ScalarSeries.h
|
|
68
|
74
|
./include/Data/DataSeriesMergeHelper.h
|
|
69
|
75
|
./include/Data/DataSeries.h
|
|
70
|
|
./include/Data/AcquisitionDataPacket.h
|
|
|
76
|
#./include/Data/AcquisitionDataPacket.h
|
|
71
|
77
|
./include/Data/DataSeriesType.h
|
|
72
|
|
./include/Data/AcquisitionRequest.h
|
|
|
78
|
#./include/Data/AcquisitionRequest.h
|
|
73
|
79
|
./include/Data/SqpIterator.h
|
|
74
|
80
|
./include/Data/ArrayData.h
|
|
75
|
81
|
./include/Data/DataSeriesIterator.h
|