Compare commits
35 Commits
| Author | SHA1 | Date |
|---|---|---|
 Kolan Sh
|
f0b7af6dad | |
|
Kolan Sh
|
59de5d3669 | |
|
Kolan Sh
|
1c43e638b3 | |
|
Kolan Sh
|
f5e8596352 | |
|
Kolan Sh
|
07bd15b2a1 | |
|
Kolan Sh
|
274859dcfd | |
|
Kolan Sh
|
fbedca3846 | |
|
Kolan Sh
|
9096a34b30 | |
|
Kolan Sh
|
ceeee0c6fd | |
|
Kolan Sh
|
85f00a43c2 | |
|
Kolan Sh
|
a85f5fc3fa | |
|
Kolan Sh
|
2184f8543d | |
|
Kolan Sh
|
e873a15136 | |
|
Kolan Sh
|
cc5618034c | |
|
Kolan Sh
|
8007e5e3d5 | |
|
Kolan Sh
|
a29ee76e60 | |
|
Kolan Sh
|
0ba41dbe9c | |
|
Kolan Sh
|
4918175db3 | |
|
Kolan Sh
|
c7d1545615 | |
|
Kolan Sh
|
c8c3623ad0 | |
|
Kolan Sh
|
47caf0b18f | |
|
Kolan Sh
|
0cc1dbd5fc | |
|
Kolan Sh
|
afe3d696e5 | |
|
Kolan Sh
|
c8fddc2999 | |
|
Kolan Sh
|
4f13fd3d6e | |
|
Kolan Sh
|
7544f32d55 | |
|
Kolan Sh
|
a68bee8a96 | |
|
Kolan Sh
|
6ada6576c4 | |
|
Kolan Sh
|
1dbf067064 | |
|
Kolan Sh
|
6ee24467db | |
|
Kolan Sh
|
79a3d0338b | |
|
Kolan Sh
|
b97eeafa0c | |
|
Kolan Sh
|
96a1d23054 | |
|
Kolan Sh
|
2230e8fd46 | |
|
Kolan Sh
|
ade1b4bbb8 |
|
|
@ -22,3 +22,24 @@
|
|||
[submodule "cairo-chart"]
|
||||
path = cairo-chart
|
||||
url = git@git.backbone.ws:kolan/Cairo-Chart.git
|
||||
[submodule "table_meas"]
|
||||
path = table_meas
|
||||
url = git@git.insysltd.org:kolan/LAview.Object.TableMeas.git
|
||||
[submodule "control_point"]
|
||||
path = control_point
|
||||
url = git@git.insysltd.org:kolan/LAview.Data.ControlPoint.git
|
||||
[submodule "stand_config"]
|
||||
path = stand_config
|
||||
url = git@git.insysltd.org:kolan/LAview.Data.StandConfig.git
|
||||
[submodule "laview-templates"]
|
||||
path = laview-templates
|
||||
url = git@git.insysltd.org:kolan/LAview.Templates.git
|
||||
[submodule "config-xml"]
|
||||
path = config-xml
|
||||
url = git@git.insysltd.org:InSysLtd/config-xml.git
|
||||
[submodule "history-data"]
|
||||
path = history-data
|
||||
url = git@git.insysltd.org:kolan/LAview.Data.History.git
|
||||
[submodule "history-object"]
|
||||
path = history-object
|
||||
url = git@git.insysltd.org:kolan/LAview.Object.History.git
|
||||
|
|
|
|||
|
|
@ -70,8 +70,29 @@ ExternalProject_Add (cairo-chart
|
|||
INSTALL_DIR bundle
|
||||
)
|
||||
|
||||
ExternalProject_Add (table_meas
|
||||
SOURCE_DIR ${CMAKE_SOURCE_DIR}/table_meas
|
||||
#CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=bundle
|
||||
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/bundle
|
||||
# PREFIX table_meas
|
||||
INSTALL_DIR bundle
|
||||
)
|
||||
|
||||
ExternalProject_Add (control_point
|
||||
SOURCE_DIR ${CMAKE_SOURCE_DIR}/control_point
|
||||
#CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=bundle
|
||||
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/bundle
|
||||
# PREFIX control_point
|
||||
INSTALL_DIR bundle
|
||||
)
|
||||
|
||||
ExternalProject_Add (stand_config
|
||||
SOURCE_DIR ${CMAKE_SOURCE_DIR}/stand_config
|
||||
#CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=bundle
|
||||
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/bundle
|
||||
# PREFIX stand_config
|
||||
INSTALL_DIR bundle
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit a9d77c1109221457ac0d0d168263a7516402f854
|
||||
Subproject commit 37a8b00ae3914768f95095df609184e581b5e915
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit b11e6e775bbdfecb8ed23df7bd75eb25973d1a7c
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 903e9251b499253bdf815925f7efbc6204fc2d68
|
||||
|
|
@ -20,10 +20,10 @@ FILE (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bundle/bin)
|
|||
FOREACH (binname gspawn-win${ARCH}-helper.exe perl.exe perl522.dll
|
||||
libatk-1.0-0.dll libbz2-1.dll libcairo-2.dll libcairo-gobject-2.dll
|
||||
libcroco-0.6-3.dll libepoxy-0.dll
|
||||
libexpat-1.dll libffi-6.dll libfontconfig-1.dll libfreetype-6.dll
|
||||
libexpat-1.dll libffi-6.dll libfontconfig-1.dll libfreetype-6.dll libfribidi-0.dll
|
||||
libgcc_s_seh-1.dll libgcc_s_dw2-1.dll
|
||||
libgdk_pixbuf-2.0-0.dll libgdk-3-0.dll libgee-0.8-2.dll libgio-2.0-0.dll libglib-2.0-0.dll
|
||||
libgmodule-2.0-0.dll libgobject-2.0-0.dll libgraphite2.dll libgtk-3-0.dll libharfbuzz-0.dll
|
||||
libgmodule-2.0-0.dll libgobject-2.0-0.dll libgraphite2.dll libgtk-3-0.dll libgxml-0.16-1.0.0.dll libharfbuzz-0.dll
|
||||
libiconv-2.dll libintl-8.dll liblzma-5.dll libpango-1.0-0.dll libpangocairo-1.0-0.dll libpangoft2-1.0-0.dll
|
||||
libpangowin32-1.0-0.dll libpcre-1.dll libpixman-1-0.dll
|
||||
libpng16-16.dll librsvg-2-2.dll libstdc++-6.dll
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 6f4a4f1a5738b40e0668924ca51084d0fae9e6f2
|
||||
Subproject commit c5a7b01170072b5e1b89072f19d5341e13a4558d
|
||||
2
desktop
2
desktop
|
|
@ -1 +1 @@
|
|||
Subproject commit 5e989b2bac920dac0bd36bd8177724468c0a69de
|
||||
Subproject commit 781da97bf1549829593439885943ea9b8072e7ce
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit f9fea4fe13189c4501b86832d4affbf5e4646c9b
|
||||
Subproject commit b15a77a18952d86687b42b9143968ce40c88c997
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 8ff028c3c84499ee7cc1a15073b74988b4a1d314
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit c43b3b11e78ad71ba4423be53066570548fda811
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 7f9b2714375d454c8cebde7586408fa6fd984cdc
|
||||
Subproject commit 41e51e9d4512ad536274e8fa82721fd60adf7dbd
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit c2b834516448dda04d7e70709b3ac09f7e70ed3e
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 0abb967086b5ca6c3699f0abee35ecb858dad44e
|
||||
Subproject commit 9abf8a04d4d428329c854ff94f6295c7f463a533
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 8e83e4f99ee2dcfa6219d6b0bb2688987eacebf4
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit bf187404b4124646d46ecb01073fb83a4df74e45
|
||||
Loading…
Reference in New Issue