##// END OF EJS Templates
HG_REPOSITORIES » LPP » SciQLOP_Repos » SciQLop
RSS
Switched to upstream repository of libcatalogs(AKA CatalogueAPI)...
jeandet -
r1337:1ffe6a6d7e2d
parent child
Show More
Side by Side Unified
Context file:
r1337:1ffe6a6d7e2d Loading diff...:
Show file before | Show file after | Hide comments
@@ -0,0 +1,1
1 Subproject commit f2fa281306099e7136a288dd70fd97d0e33afa15
Show file before | Show file after | Hide comments
@@ -0,0 +1,4
1 [wrap-git]
2 directory=libcatalogs
3 url=https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/SciQLOP_Repos/libcatalogs.git
4 revision=master
Show file before | Show file after | Hide comments
@@ -1,3 +1,6
1 1 [submodule "external/CatalogueAPI"]
2 2 path = external/CatalogueAPI
3 3 url = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/CatalogueAPI
4 [submodule "external/libcatalogs"]
5 path = external/libcatalogs
6 url = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/SciQLOP_Repos/libcatalogs
Show file before | Show file after | Hide comments
@@ -1,62 +1,62
1 1 cmake_minimum_required(VERSION 3.6)
2 2 project(SciQLOP CXX)
3 3
4 4 include(GNUInstallDirs)
5 5
6 6 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake")
7 7
8 8 OPTION (CPPCHECK "Analyzes the source code with cppcheck" OFF)
9 9 OPTION (CLANG_TIDY "Analyzes the source code with Clang Tidy" OFF)
10 10 OPTION (IWYU "Analyzes the source code with Include What You Use" OFF)
11 11
12 12 set(CMAKE_CXX_STANDARD 14)
13 13
14 14 set(CMAKE_AUTOMOC ON)
15 15 #https://gitlab.kitware.com/cmake/cmake/issues/15227
16 16 #set(CMAKE_AUTOUIC ON)
17 17 if(POLICY CMP0071)
18 18 cmake_policy(SET CMP0071 OLD)
19 19 endif()
20 20 set(CMAKE_AUTORCC ON)
21 21 set(CMAKE_INCLUDE_CURRENT_DIR ON)
22 22
23 23 if(NOT DEFINED CMAKE_INSTALL_RPATH_USE_LINK_PATH)
24 24 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
25 25 endif()
26 26 if(NOT DEFINED CMAKE_MACOSX_RPATH)
27 27 set(CMAKE_MACOSX_RPATH TRUE)
28 28 endif()
29 29
30 30 if(NOT CMAKE_BUILD_TYPE)
31 31 set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
32 32 endif()
33 33
34 34 find_package(Qt5 COMPONENTS Core Widgets Network PrintSupport Svg Test REQUIRED)
35 35
36 36 IF(CPPCHECK)
37 37 set(CMAKE_CXX_CPPCHECK "cppcheck;--enable=warning,style")
38 38 ENDIF(CPPCHECK)
39 39
40 40 IF(CLANG_TIDY)
41 41 set(CMAKE_CXX_CLANG_TIDY "clang-tidy;-style=file;-checks=*")
42 42 ENDIF(CLANG_TIDY)
43 43
44 44 IF(IWYU)
45 45 set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "include-what-you-use")
46 46 ENDIF(IWYU)
47 47
48 48 enable_testing()
49 49
50 50
51 find_package(CatalogueAPI CONFIG QUIET)
51 find_package(catalogs CONFIG QUIET)
52 52 if (NOT CatalogueAPI_FOUND)
53 execute_process(COMMAND git submodule init external/CatalogueAPI WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
54 execute_process(COMMAND git submodule update external/CatalogueAPI WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
55 add_subdirectory(external/CatalogueAPI)
53 execute_process(COMMAND git submodule init external/libcatalogs WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
54 execute_process(COMMAND git submodule update external/libcatalogs WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
55 add_subdirectory(external/libcatalogs)
56 56 endif()
57 57
58 58 add_subdirectory(core)
59 59 add_subdirectory(gui)
60 60 add_subdirectory(app)
61 61 add_subdirectory(plugins)
62 62 add_subdirectory(docs)
Show file before | Show file after | Hide comments
@@ -1,31 +1,31
1 1 FILE (GLOB_RECURSE core_SRCS
2 2 include/*.h
3 3 src/*.cpp
4 4 )
5 5
6 6 add_definitions(-DCORE_STATIC)
7 7
8 8 add_library(sciqlopcore ${core_SRCS})
9 9 SET_TARGET_PROPERTIES(sciqlopcore PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
10 10
11 11 target_include_directories(sciqlopcore PUBLIC
12 12 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
13 13 $<INSTALL_INTERFACE:include/SciQLOP>
14 14 )
15 15
16 16 target_link_libraries(sciqlopcore PUBLIC
17 17 Qt5::Core
18 18 Qt5::Network
19 CatalogueAPI
19 catalogs
20 20 )
21 21
22 22 install(TARGETS sciqlopcore EXPORT SciQLOPCoreConfig
23 23 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
24 24 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
25 25 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
26 26
27 27 install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SciQLOP)
28 28 install(EXPORT SciQLOPCoreConfig DESTINATION share/SciQLOPCore/cmake)
29 29 export(TARGETS sciqlopcore FILE SciQLOPCoreConfig.cmake)
30 30
31 31 add_subdirectory(tests)
Show file before | Show file after | Hide comments
@@ -1,75 +1,75
1 1
2 2 qxorm_dep = dependency('QxOrm', required : true, fallback:['QxOrm','qxorm_dep'])
3 catalogueapi_dep = dependency('CatalogueAPI', required : true, fallback:['CatalogueAPI','CatalogueAPI_dep'])
3 libcatalogs_dep = dependency('libcatalogs', required : true, fallback:['libcatalogs','libcatalogs_dep'])
4 4
5 5
6 6 core_moc_headers = [
7 7 'include/Catalogue/CatalogueController.h',
8 8 'include/Common/SignalWaiter.h',
9 9 'include/Data/IDataProvider.h',
10 10 'include/DataSource/DataSourceController.h',
11 11 'include/DataSource/DataSourceItemAction.h',
12 12 'include/Network/NetworkController.h',
13 13 'include/Time/TimeController.h',
14 14 'include/Variable/Variable.h',
15 15 'include/Variable/VariableCacheController.h',
16 16 'include/Variable/VariableController.h',
17 17 'include/Variable/VariableAcquisitionWorker.h',
18 18 'include/Variable/VariableSynchronizationGroup.h',
19 19 'include/Variable/VariableModel.h',
20 20 'include/Visualization/VisualizationController.h'
21 21 ]
22 22
23 23
24 24 core_moc_files = qt5.preprocess(moc_headers : core_moc_headers)
25 25
26 26 core_sources = [
27 27 'src/Common/DateUtils.cpp',
28 28 'src/Common/SignalWaiter.cpp',
29 29 'src/Common/StringUtils.cpp',
30 30 'src/Common/MimeTypesDef.cpp',
31 31 'src/Catalogue/CatalogueController.cpp',
32 32 'src/Data/ScalarSeries.cpp',
33 33 'src/Data/SpectrogramSeries.cpp',
34 34 'src/Data/DataSeriesIterator.cpp',
35 35 'src/Data/ArrayDataIterator.cpp',
36 36 'src/Data/VectorSeries.cpp',
37 37 'src/Data/OptionalAxis.cpp',
38 38 'src/Data/DataSeriesUtils.cpp',
39 39 'src/DataSource/DataSourceController.cpp',
40 40 'src/DataSource/DataSourceItem.cpp',
41 41 'src/DataSource/DataSourceItemAction.cpp',
42 42 'src/DataSource/DataSourceItemMergeHelper.cpp',
43 43 'src/Network/NetworkController.cpp',
44 44 'src/PluginManager/PluginManager.cpp',
45 45 'src/Settings/SqpSettingsDefs.cpp',
46 46 'src/Time/TimeController.cpp',
47 47 'src/Variable/Variable.cpp',
48 48 'src/Variable/VariableCacheController.cpp',
49 49 'src/Variable/VariableController.cpp',
50 50 'src/Variable/VariableAcquisitionWorker.cpp',
51 51 'src/Variable/VariableSynchronizationGroup.cpp',
52 52 'src/Variable/VariableModel.cpp',
53 53 'src/Visualization/VisualizationController.cpp'
54 54 ]
55 55
56 56 core_inc = include_directories(['include', 'include/Plugin'])
57 57
58 58 sciqlop_core_lib = library('sciqlopcore',
59 59 core_sources,
60 60 core_moc_files,
61 61 cpp_args : '-DCORE_LIB',
62 62 include_directories : core_inc,
63 dependencies : [qt5core, qt5network, catalogueapi_dep],
63 dependencies : [qt5core, qt5network, libcatalogs_dep],
64 64 install : true
65 65 )
66 66
67 67
68 68 sciqlop_core = declare_dependency(link_with : sciqlop_core_lib,
69 69 include_directories : core_inc,
70 dependencies : [qt5core, qt5network, catalogueapi_dep])
70 dependencies : [qt5core, qt5network, libcatalogs_dep])
71 71
72 72
73 73
74 74 subdir('tests')
75 75
Show file before | Show file after | Hide comments
@@ -1,147 +1,145
1 qxorm_dep = dependency('QxOrm', required : true, fallback:['QxOrm','qxorm_dep'])
2 catalogueapi_dep = dependency('CatalogueAPI', required : true, fallback:['CatalogueAPI','CatalogueAPI_dep'])
3 1
4 2 gui_moc_headers = [
5 3 'include/DataSource/DataSourceWidget.h',
6 4 'include/Settings/SqpSettingsDialog.h',
7 5 'include/Settings/SqpSettingsGeneralWidget.h',
8 6 'include/SidePane/SqpSidePane.h',
9 7 'include/SqpApplication.h',
10 8 'include/DragAndDrop/DragDropScroller.h',
11 9 'include/DragAndDrop/DragDropTabSwitcher.h',
12 10 'include/TimeWidget/TimeWidget.h',
13 11 'include/Variable/VariableInspectorWidget.h',
14 12 'include/Variable/RenameVariableDialog.h',
15 13 'include/Visualization/qcustomplot.h',
16 14 'include/Visualization/VisualizationGraphWidget.h',
17 15 'include/Visualization/VisualizationTabWidget.h',
18 16 'include/Visualization/VisualizationWidget.h',
19 17 'include/Visualization/VisualizationZoneWidget.h',
20 18 'include/Visualization/VisualizationDragDropContainer.h',
21 19 'include/Visualization/VisualizationDragWidget.h',
22 20 'include/Visualization/ColorScaleEditor.h',
23 21 'include/Visualization/VisualizationSelectionZoneItem.h',
24 22 'include/Actions/SelectionZoneAction.h',
25 23 'include/Visualization/VisualizationMultiZoneSelectionDialog.h',
26 24 'include/Catalogue/CatalogueExplorer.h',
27 25 'include/Catalogue/CatalogueEventsWidget.h',
28 26 'include/Catalogue/CatalogueSideBarWidget.h',
29 27 'include/Catalogue/CatalogueInspectorWidget.h',
30 28 'include/Catalogue/CatalogueEventsModel.h',
31 29 'include/Catalogue/CatalogueTreeModel.h',
32 30 'include/Actions/FilteringAction.h'
33 31 ]
34 32
35 33 gui_ui_files = [
36 34 'ui/DataSource/DataSourceWidget.ui',
37 35 'ui/Settings/SqpSettingsDialog.ui',
38 36 'ui/Settings/SqpSettingsGeneralWidget.ui',
39 37 'ui/SidePane/SqpSidePane.ui',
40 38 'ui/TimeWidget/TimeWidget.ui',
41 39 'ui/Variable/VariableInspectorWidget.ui',
42 40 'ui/Variable/RenameVariableDialog.ui',
43 41 'ui/Variable/VariableMenuHeaderWidget.ui',
44 42 'ui/Visualization/VisualizationGraphWidget.ui',
45 43 'ui/Visualization/VisualizationTabWidget.ui',
46 44 'ui/Visualization/VisualizationWidget.ui',
47 45 'ui/Visualization/VisualizationZoneWidget.ui',
48 46 'ui/Visualization/ColorScaleEditor.ui',
49 47 'ui/Visualization/VisualizationMultiZoneSelectionDialog.ui',
50 48 'ui/Catalogue/CatalogueExplorer.ui',
51 49 'ui/Catalogue/CatalogueEventsWidget.ui',
52 50 'ui/Catalogue/CatalogueSideBarWidget.ui',
53 51 'ui/Catalogue/CatalogueInspectorWidget.ui'
54 52 ]
55 53
56 54 gui_qresources = ['resources/sqpguiresources.qrc']
57 55
58 56 rcc_gen = generator(rcc,
59 57 output : 'qrc_@BASENAME@.cpp',
60 58 arguments : [
61 59 '--output',
62 60 '@OUTPUT@',
63 61 '@INPUT@',
64 62 '@EXTRA_ARGS@'])
65 63
66 64 rcc_files = rcc_gen.process(gui_qresources, extra_args : ['-name', 'sqpguiresources'])
67 65
68 66 gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers,
69 67 ui_files : gui_ui_files)
70 68
71 69 gui_sources = [
72 70 'src/SqpApplication.cpp',
73 71 'src/DragAndDrop/DragDropGuiController.cpp',
74 72 'src/DragAndDrop/DragDropScroller.cpp',
75 73 'src/DragAndDrop/DragDropTabSwitcher.cpp',
76 74 'src/Common/ColorUtils.cpp',
77 75 'src/Common/VisualizationDef.cpp',
78 76 'src/DataSource/DataSourceTreeWidgetItem.cpp',
79 77 'src/DataSource/DataSourceTreeWidgetHelper.cpp',
80 78 'src/DataSource/DataSourceWidget.cpp',
81 79 'src/DataSource/DataSourceTreeWidget.cpp',
82 80 'src/Settings/SqpSettingsDialog.cpp',
83 81 'src/Settings/SqpSettingsGeneralWidget.cpp',
84 82 'src/SidePane/SqpSidePane.cpp',
85 83 'src/TimeWidget/TimeWidget.cpp',
86 84 'src/Variable/VariableInspectorWidget.cpp',
87 85 'src/Variable/VariableInspectorTableView.cpp',
88 86 'src/Variable/VariableMenuHeaderWidget.cpp',
89 87 'src/Variable/RenameVariableDialog.cpp',
90 88 'src/Visualization/VisualizationGraphHelper.cpp',
91 89 'src/Visualization/VisualizationGraphRenderingDelegate.cpp',
92 90 'src/Visualization/VisualizationGraphWidget.cpp',
93 91 'src/Visualization/VisualizationTabWidget.cpp',
94 92 'src/Visualization/VisualizationWidget.cpp',
95 93 'src/Visualization/VisualizationZoneWidget.cpp',
96 94 'src/Visualization/qcustomplot.cpp',
97 95 'src/Visualization/QCustomPlotSynchronizer.cpp',
98 96 'src/Visualization/operations/FindVariableOperation.cpp',
99 97 'src/Visualization/operations/GenerateVariableMenuOperation.cpp',
100 98 'src/Visualization/operations/MenuBuilder.cpp',
101 99 'src/Visualization/operations/RemoveVariableOperation.cpp',
102 100 'src/Visualization/operations/RescaleAxeOperation.cpp',
103 101 'src/Visualization/VisualizationDragDropContainer.cpp',
104 102 'src/Visualization/VisualizationDragWidget.cpp',
105 103 'src/Visualization/AxisRenderingUtils.cpp',
106 104 'src/Visualization/PlottablesRenderingUtils.cpp',
107 105 'src/Visualization/MacScrollBarStyle.cpp',
108 106 'src/Visualization/VisualizationCursorItem.cpp',
109 107 'src/Visualization/ColorScaleEditor.cpp',
110 108 'src/Visualization/SqpColorScale.cpp',
111 109 'src/Visualization/QCPColorMapIterator.cpp',
112 110 'src/Visualization/VisualizationSelectionZoneItem.cpp',
113 111 'src/Visualization/VisualizationSelectionZoneManager.cpp',
114 112 'src/Actions/SelectionZoneAction.cpp',
115 113 'src/Actions/ActionsGuiController.cpp',
116 114 'src/Actions/FilteringAction.cpp',
117 115 'src/Visualization/VisualizationActionManager.cpp',
118 116 'src/Visualization/VisualizationMultiZoneSelectionDialog.cpp',
119 117 'src/Catalogue/CatalogueExplorer.cpp',
120 118 'src/Catalogue/CatalogueEventsWidget.cpp',
121 119 'src/Catalogue/CatalogueSideBarWidget.cpp',
122 120 'src/Catalogue/CatalogueInspectorWidget.cpp',
123 121 'src/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.cpp',
124 122 'src/Catalogue/CatalogueTreeItems/CatalogueTreeItem.cpp',
125 123 'src/Catalogue/CatalogueTreeItems/CatalogueTextTreeItem.cpp',
126 124 'src/Catalogue/CatalogueEventsModel.cpp',
127 125 'src/Catalogue/CatalogueExplorerHelper.cpp',
128 126 'src/Catalogue/CatalogueActionManager.cpp',
129 127 'src/Catalogue/CatalogueTreeModel.cpp'
130 128 ]
131 129
132 130 gui_inc = include_directories(['include'])
133 131
134 132 sciqlop_gui_lib = library('sciqlopgui',
135 133 gui_sources,
136 134 gui_moc_files,
137 135 rcc_files,
138 136 include_directories : [gui_inc],
139 dependencies : [ qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core, catalogueapi_dep],
137 dependencies : [ qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core],
140 138 install : true
141 139 )
142 140
143 141 sciqlop_gui = declare_dependency(link_with : sciqlop_gui_lib,
144 142 include_directories : gui_inc,
145 dependencies : [qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core, catalogueapi_dep])
143 dependencies : [qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core])
146 144
147 145
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now