Skip to content

GitLab

Commit ef7c7ca4 authored by Jan Möbius's avatar Jan Möbius
Browse files
Options

Switched to Qt 5.10.1 as department default

parent 5b95ab9b
Pipeline #6967 canceled with stages
        in 13 minutes and 55 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 3 additions and 3 deletions
        CMakeLists.txt
        View file @ ef7c7ca4
        ...@@ -20,9 +20,9 @@ set( CMAKE_CXX_STANDARD 11 ) ...@@ -20,9 +20,9 @@ set( CMAKE_CXX_STANDARD 11 )
        # ACG Environment default settings # ACG Environment default settings
        # This is ugly but currently we need to work around the default installed 5.3 on debian # This is ugly but currently we need to work around the default installed 5.3 on debian
        if ( EXISTS /ACG/acgdev/gcc-x86_64/qt-5.9.0/5.9/gcc_64/ ) if ( EXISTS /ACG/acgdev/gcc-x86_64/qt-5.10.1/5.10.1/gcc_64/ )
        # Default to this install path for QT%_INSTALL_DIR # Default to this install path for QT%_INSTALL_DIR
        set (QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.9.0/5.9/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment" ) set (QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.10.1/5.10.1/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment" )
        endif() endif()
        if ( WIN32 ) if ( WIN32 )
        ......
        OpenFlipper @ f6c8e0fd
        Compare baa3af2d...f6c8e0fd
        Subproject commit baa3af2da15e6badbfb935eb351f191822620267 Subproject commit f6c8e0fdce3049611c68672dde6e82978b590b0b
        Markdown is supported
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment