Compare commits
35 Commits
Author | SHA1 | Date |
---|---|---|
Kolan Sh | 0f4311456b | |
Kolan Sh | c7b4f5d2d8 | |
Kolan Sh | 70786bdd16 | |
Kolan Sh | d35d5a6846 | |
Kolan Sh | 5e69bfb381 | |
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,18 @@
|
||||||
[submodule "cairo-chart"]
|
[submodule "cairo-chart"]
|
||||||
path = cairo-chart
|
path = cairo-chart
|
||||||
url = git@git.backbone.ws:kolan/Cairo-Chart.git
|
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
|
||||||
|
|
|
@ -70,8 +70,29 @@ ExternalProject_Add (cairo-chart
|
||||||
INSTALL_DIR bundle
|
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
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
for d in cairo-chart gobject-plugin latex-struct core data-example object-example stand_config control_point desktop table_meas; do cd $d && mkdir -p build-mingw32 && cd build-mingw32 && rm -rf * && cmake -G "MSYS Makefiles" .. -DCMAKE_BUILD_TYPE=Release && make && cpack && ./*.exe && cd ../.. || break; done
|
|
@ -0,0 +1,3 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
for d in cairo-chart gobject-plugin latex-struct core data-example object-example stand_config control_point desktop table_meas; do cd $d && mkdir -p build-mingw64 && cd build-mingw64 && rm -rf * && cmake -G "MSYS Makefiles" .. -DCMAKE_BUILD_TYPE=Release && make && cpack && ./*.exe && cd ../.. || break; done
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit b11e6e775bbdfecb8ed23df7bd75eb25973d1a7c
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit f40ed06c9aec2b58f45d45a6bb4e2cdf0cdcd63a
|
|
@ -19,15 +19,15 @@ SET (CPACK_CREATE_DESKTOP_LINKS "..\\\\win${ARCH}\\\\bundle\\\\bin\\\\laview-des
|
||||||
FILE (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bundle/bin)
|
FILE (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bundle/bin)
|
||||||
FOREACH (binname gspawn-win${ARCH}-helper.exe perl.exe perl522.dll
|
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
|
libatk-1.0-0.dll libbz2-1.dll libcairo-2.dll libcairo-gobject-2.dll
|
||||||
libcroco-0.6-3.dll libepoxy-0.dll
|
libcroco-0.6-3.dll libdatrie-1.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
|
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
|
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
|
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
|
libpangowin32-1.0-0.dll libpcre-1.dll libpixman-1-0.dll
|
||||||
libpng16-16.dll librsvg-2-2.dll libstdc++-6.dll
|
libpng16-16.dll librsvg-2-2.dll libstdc++-6.dll libthai-0.dll
|
||||||
libwinpthread-1.dll libxml2-2.dll zlib1.dll)
|
libwinpthread-1.dll libxml2-2.dll perl528.dll zlib1.dll)
|
||||||
EXECUTE_PROCESS (COMMAND cp /mingw${ARCH}/bin/${binname} ${CMAKE_BINARY_DIR}/bundle/bin)
|
EXECUTE_PROCESS (COMMAND cp /mingw${ARCH}/bin/${binname} ${CMAKE_BINARY_DIR}/bundle/bin)
|
||||||
ENDFOREACH (binname)
|
ENDFOREACH (binname)
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit c2b834516448dda04d7e70709b3ac09f7e70ed3e
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 8e61eb2816aa4a4a5afd3d70121724692ded106d
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 00c3ee739d5d6417ccda55d9e47703f18f237ac8
|
Loading…
Reference in New Issue