Commit bc1c98fd authored by Mathieu Valois's avatar Mathieu Valois
Browse files

Merge branch 'cmake'

parents 31df3656 2044cbd9

.gitlab-ci.yml

+10 −10
Original line number Diff line number Diff line
@@ -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)
@@ -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)
@@ -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

GUI.pro

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
QT += core gui

QT += widgets

QT += charts



TARGET  = cppack-gui

TEMPLATE = app



INCLUDEPATH += include

OBJECTS_DIR=obj/gui/

MOC_DIR=obj/gui/





SOURCES += src/gui/maingui.cpp\

        src/gui/mainwindow.cpp\

        src/core/statsgen.cpp



HEADERS  += include/mainwindow.h\

        include/statsgen.h\

        include/utils.h



FORMS    += forms/mainwindow.ui





QMAKE_CXXFLAGS += -std=c++11 -lpthread

QMAKE_CXXFLAGS_RELEASE -= -O1

QMAKE_CXXFLAGS_RELEASE -= -O2

QMAKE_CXXFLAGS_RELEASE *= -O3
 
 No newline at end of file