Loading .gitlab-ci.yml +10 −10 Original line number Diff line number Diff line Loading @@ -3,21 +3,21 @@ image: ubuntu:bionic build-cli: before_script: - apt-get -qq update - apt-get -qq -y install build-essential script: make -j$(nproc) cppack - apt-get -qq -y install build-essential cmake script: - cmake . - make -j$(nproc) cppack artifacts: paths: - cppack - bin/cppack build-gui: before_script: - apt-get -qq update - apt-get -qq -y install build-essential qt5-default libqt5charts5-dev supervisor openssh-server script: make -j$(nproc) cppack-gui - apt-get -qq -y install build-essential qt5-default libqt5charts5-dev cmake script: - cmake . - make -j$(nproc) cppack-gui artifacts: paths: - cppack-gui - bin/cppack-gui CMakeLists.txt +6 −2 Original line number Diff line number Diff line # Version de cmake demandée. cmake_minimum_required(VERSION 2.8) find_package(Threads) find_package(Threads REQUIRED) # Chemin des répertoires contenant les fichiers entêtes. include_directories(include) Loading @@ -25,7 +25,8 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) find_package(Qt5Core REQUIRED) find_package(Qt5Core) if(Qt5Core_FOUND) find_package(Qt5Gui REQUIRED) find_package(Qt5Widgets REQUIRED) find_package(Qt5Charts REQUIRED) Loading @@ -40,3 +41,6 @@ add_executable(cppack-gui ) target_link_libraries(cppack-gui Qt5::Core Qt5::Widgets Qt5::Charts ${CMAKE_THREAD_LIBS_INIT}) else() message(STATUS "Qt5 not found. Not building GUI.") endif() No newline at end of file Loading
.gitlab-ci.yml +10 −10 Original line number Diff line number Diff line Loading @@ -3,21 +3,21 @@ image: ubuntu:bionic build-cli: before_script: - apt-get -qq update - apt-get -qq -y install build-essential script: make -j$(nproc) cppack - apt-get -qq -y install build-essential cmake script: - cmake . - make -j$(nproc) cppack artifacts: paths: - cppack - bin/cppack build-gui: before_script: - apt-get -qq update - apt-get -qq -y install build-essential qt5-default libqt5charts5-dev supervisor openssh-server script: make -j$(nproc) cppack-gui - apt-get -qq -y install build-essential qt5-default libqt5charts5-dev cmake script: - cmake . - make -j$(nproc) cppack-gui artifacts: paths: - cppack-gui - bin/cppack-gui
CMakeLists.txt +6 −2 Original line number Diff line number Diff line # Version de cmake demandée. cmake_minimum_required(VERSION 2.8) find_package(Threads) find_package(Threads REQUIRED) # Chemin des répertoires contenant les fichiers entêtes. include_directories(include) Loading @@ -25,7 +25,8 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) find_package(Qt5Core REQUIRED) find_package(Qt5Core) if(Qt5Core_FOUND) find_package(Qt5Gui REQUIRED) find_package(Qt5Widgets REQUIRED) find_package(Qt5Charts REQUIRED) Loading @@ -40,3 +41,6 @@ add_executable(cppack-gui ) target_link_libraries(cppack-gui Qt5::Core Qt5::Widgets Qt5::Charts ${CMAKE_THREAD_LIBS_INIT}) else() message(STATUS "Qt5 not found. Not building GUI.") endif() No newline at end of file