##// 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 [submodule "external/CatalogueAPI"]
1 [submodule "external/CatalogueAPI"]
2 path = external/CatalogueAPI
2 path = external/CatalogueAPI
3 url = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/CatalogueAPI
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
@@ -48,11 +48,11 ENDIF(IWYU)
48 enable_testing()
48 enable_testing()
49
49
50
50
51 find_package(CatalogueAPI CONFIG QUIET)
51 find_package(catalogs CONFIG QUIET)
52 if (NOT CatalogueAPI_FOUND)
52 if (NOT CatalogueAPI_FOUND)
53 execute_process(COMMAND git submodule init external/CatalogueAPI WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
53 execute_process(COMMAND git submodule init external/libcatalogs WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
54 execute_process(COMMAND git submodule update external/CatalogueAPI 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/CatalogueAPI)
55 add_subdirectory(external/libcatalogs)
56 endif()
56 endif()
57
57
58 add_subdirectory(core)
58 add_subdirectory(core)
Show file before | Show file after | Hide comments
@@ -16,7 +16,7 target_include_directories(sciqlopcore PUBLIC
16 target_link_libraries(sciqlopcore PUBLIC
16 target_link_libraries(sciqlopcore PUBLIC
17 Qt5::Core
17 Qt5::Core
18 Qt5::Network
18 Qt5::Network
19 CatalogueAPI
19 catalogs
20 )
20 )
21
21
22 install(TARGETS sciqlopcore EXPORT SciQLOPCoreConfig
22 install(TARGETS sciqlopcore EXPORT SciQLOPCoreConfig
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1
1
2 qxorm_dep = dependency('QxOrm', required : true, fallback:['QxOrm','qxorm_dep'])
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 core_moc_headers = [
6 core_moc_headers = [
@@ -60,14 +60,14 sciqlop_core_lib = library('sciqlopcore',
60 core_moc_files,
60 core_moc_files,
61 cpp_args : '-DCORE_LIB',
61 cpp_args : '-DCORE_LIB',
62 include_directories : core_inc,
62 include_directories : core_inc,
63 dependencies : [qt5core, qt5network, catalogueapi_dep],
63 dependencies : [qt5core, qt5network, libcatalogs_dep],
64 install : true
64 install : true
65 )
65 )
66
66
67
67
68 sciqlop_core = declare_dependency(link_with : sciqlop_core_lib,
68 sciqlop_core = declare_dependency(link_with : sciqlop_core_lib,
69 include_directories : core_inc,
69 include_directories : core_inc,
70 dependencies : [qt5core, qt5network, catalogueapi_dep])
70 dependencies : [qt5core, qt5network, libcatalogs_dep])
71
71
72
72
73
73
Show file before | Show file after | Hide comments
@@ -1,5 +1,3
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 gui_moc_headers = [
2 gui_moc_headers = [
5 'include/DataSource/DataSourceWidget.h',
3 'include/DataSource/DataSourceWidget.h',
@@ -136,12 +134,12 sciqlop_gui_lib = library('sciqlopgui',
136 gui_moc_files,
134 gui_moc_files,
137 rcc_files,
135 rcc_files,
138 include_directories : [gui_inc],
136 include_directories : [gui_inc],
139 dependencies : [ qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core, catalogueapi_dep],
137 dependencies : [ qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core],
140 install : true
138 install : true
141 )
139 )
142
140
143 sciqlop_gui = declare_dependency(link_with : sciqlop_gui_lib,
141 sciqlop_gui = declare_dependency(link_with : sciqlop_gui_lib,
144 include_directories : gui_inc,
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
NO CONTENT: file was removed
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now