Compare commits

..

2 Commits

Author SHA1 Message Date
Kolan Sh 0617c6bb09 Submodules updated 2020-04-29 11:50:55 +03:00
Kolan Sh 88317f0585 Submodules updated 2019-05-16 13:00:24 +03:00
17 changed files with 9 additions and 58 deletions

21
.gitmodules vendored
View File

@ -22,24 +22,3 @@
[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

View File

@ -70,29 +70,8 @@ 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 37a8b00ae3914768f95095df609184e581b5e915
Subproject commit 7748a11de4823d36236f3456144434c63f3285a0

@ -1 +0,0 @@
Subproject commit b11e6e775bbdfecb8ed23df7bd75eb25973d1a7c

@ -1 +0,0 @@
Subproject commit 903e9251b499253bdf815925f7efbc6204fc2d68

2
core

@ -1 +1 @@
Subproject commit 0895e89413b114fd945d06f7b2f5a9b4d8cc5446
Subproject commit 3e214e8234d6cc80dd73a06b7bf7004683b3767d

View File

@ -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 libfribidi-0.dll
libexpat-1.dll libffi-6.dll libfontconfig-1.dll libfreetype-6.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 libgxml-0.16-1.0.0.dll libharfbuzz-0.dll
libgmodule-2.0-0.dll libgobject-2.0-0.dll libgraphite2.dll libgtk-3-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 c5a7b01170072b5e1b89072f19d5341e13a4558d
Subproject commit 945c110a472deacbba997b7d72dd7512b0eba5cb

@ -1 +1 @@
Subproject commit 781da97bf1549829593439885943ea9b8072e7ce
Subproject commit fa03fc7190788634c270d0e6c0734c0bf92946b9

@ -1 +1 @@
Subproject commit b15a77a18952d86687b42b9143968ce40c88c997
Subproject commit e73cf2d921b4249d320d113dd0ffdb666caca853

@ -1 +0,0 @@
Subproject commit 8ff028c3c84499ee7cc1a15073b74988b4a1d314

@ -1 +0,0 @@
Subproject commit c43b3b11e78ad71ba4423be53066570548fda811

@ -1 +1 @@
Subproject commit 41e51e9d4512ad536274e8fa82721fd60adf7dbd
Subproject commit fd585f9749b0d8f700554b42d23895c88ae76424

@ -1 +0,0 @@
Subproject commit c2b834516448dda04d7e70709b3ac09f7e70ed3e

@ -1 +1 @@
Subproject commit 9abf8a04d4d428329c854ff94f6295c7f463a533
Subproject commit 8faee221d77e24b3e431507c287915a7e67bcdf0

@ -1 +0,0 @@
Subproject commit 8e83e4f99ee2dcfa6219d6b0bb2688987eacebf4

@ -1 +0,0 @@
Subproject commit bf187404b4124646d46ecb01073fb83a4df74e45