Commit 9915076e authored by Thomas Braun's avatar Thomas Braun
Browse files

Merge branch 'update' into 'main' 

Make it comile with latest cppTango main and update TangoCmakeModules

See merge request !24
parents 4e017ae5 21978c2f

.gitlab-ci.yml

+3 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ build-cppTango-9.3-backports: 
      omniidl

      pkg-config

    # Install tango-idl

    - git clone --depth 1 https://gitlab.com/tango-controls/tango-idl.git /idl

    - git clone -b 5.1.2 --depth 1 https://gitlab.com/tango-controls/tango-idl.git /idl

    - cmake -B /idl/build -DCMAKE_INSTALL_PREFIX=/usr/local/tango-idl /idl

    - make -C /idl/build install

    # Install cppzmq
@@ -90,7 +90,7 @@ build-cppTango-main: 
    - make install

    - cd ${CI_PROJECT_DIR}

    # Install tango-idl

    - git clone -b 6.0-alpha2 --depth 1 https://gitlab.com/tango-controls/tango-idl.git /idl

    - git clone -b 6.0.2 --depth 1 https://gitlab.com/tango-controls/tango-idl.git /idl

    - cmake -B /idl/build -DCMAKE_INSTALL_PREFIX=/usr/local/tango-idl /idl

    - make -j$(nproc) -C /idl/build install

    # Install cppzmq
@@ -105,6 +105,7 @@ build-cppTango-main: 
      -DBUILD_TESTING=OFF

      -Dtangoidl_ROOT=/usr/local/tango-idl

      -DTANGO_USE_JPEG=OFF

      -DTANGO_USE_TELEMETRY=OFF

      /cppTango

  script:

    - make -j$(nproc) -C /cppTango/build install

TangoCMakeModules @ dfc42901

Compare b79f6ea0 to dfc42901
Original line number Diff line number Diff line 
Subproject commit b79f6ea077d66260bcafecdd1811d9c581f7ac30
 
Subproject commit dfc42901855bc7aae72a132e6f3373bab8660747