diff --git a/.gitmodules b/.gitmodules index 825dfd4..23bf087 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,15 @@ [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 diff --git a/CMakeLists.txt b/CMakeLists.txt index a314e72..6816831 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 +) diff --git a/control_point b/control_point new file mode 160000 index 0000000..1b9ff41 --- /dev/null +++ b/control_point @@ -0,0 +1 @@ +Subproject commit 1b9ff41b372be4614b149a128e0281d89b3a6f58 diff --git a/laview-templates b/laview-templates new file mode 160000 index 0000000..c808d2b --- /dev/null +++ b/laview-templates @@ -0,0 +1 @@ +Subproject commit c808d2b897d91a83f0148d8b045c4ee751bbc042 diff --git a/stand_config b/stand_config new file mode 160000 index 0000000..7e02494 --- /dev/null +++ b/stand_config @@ -0,0 +1 @@ +Subproject commit 7e024940fa979ee635be93da8dd4f2b0808f1a55 diff --git a/table_meas b/table_meas new file mode 160000 index 0000000..55306ed --- /dev/null +++ b/table_meas @@ -0,0 +1 @@ +Subproject commit 55306edaabda02ea90eaf24b958c71f3dbb02933