Commit 1bdb93dc authored by Reynald Bourtembourg's avatar Reynald Bourtembourg
Browse files

Merge branch 'fix-build-cpptango-main-ci-job' into 'main' 

Use tango-idl 6.0-alpha2 for build-cppTango-main CI job (Fix #10)

Closes #10

See merge request !22
parents 8de064cf bdd7cc25

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ build-cppTango-main: 
    - make install

    - cd ${CI_PROJECT_DIR}

    # Install tango-idl

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

    - git clone -b 6.0-alpha2 --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

TangoAccessControl/CMakeLists.txt

+7 −0
Original line number Diff line number Diff line
@@ -12,6 +12,13 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/TangoCMakeModules) 
find_package(MySQL REQUIRED)

find_package(Tango REQUIRED)



if(NOT DEFINED CMAKE_CXX_STANDARD)

    set(CMAKE_CXX_STANDARD 17)

endif()



set(CMAKE_CXX_EXTENSIONS OFF)

set(CMAKE_STANDARD_REQUIRED YES)



set(SOURCES ClassFactory.cpp

            DbUtils.cpp

            TangoAccessControlStateMachine.cpp