Skip to content

Commit ab7520a

Browse files
proydakovproydakov
committed
Добавляем github сборку для gcc-11 + починка компиляции на ubuntu 22.04.
Signed-off-by: Evgeny Proydakov <[email protected]>
1 parent 9c9c5df commit ab7520a

File tree

16 files changed

+79
-31
lines changed

16 files changed

+79
-31
lines changed

‎.github/workflows/linux-gcc-x64.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: linux-gcc-x64
2+
on:
3+
push:
4+
branches: [master]
5+
pull_request:
6+
branches: [master]
7+
jobs:
8+
cloud-ci:
9+
runs-on: ubuntu-22.04
10+
steps:
11+
- uses: actions/checkout@v3
12+
- name: install-tools
13+
run: |
14+
sudo apt-get update
15+
sudo apt-get install cmake ninja-build gcc-11 g++-11 qtbase5-dev qt5-qmake qttools5-dev qttools5-dev-tools libgl1-mesa-dev libboost-all-dev bison flex libfl-dev
16+
- name: build
17+
env:
18+
CC: gcc-11
19+
CXX: g++-11
20+
TYPE: Release
21+
run: |
22+
$CC --version
23+
$CXX --version
24+
mkdir build && cd build
25+
cmake -GNinja -DCMAKE_BUILD_TYPE=${TYPE} ..
26+
cmake --build .
27+
- name: test
28+
run: cd build && ctest

‎CMakeLists.txt‎

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
#==============================================================================
22
# Copyright (c) 2011-2013 Evgeny Proydakov <[email protected]>
3+
# Copyright (c) 2025-2025 Evgeny Proydakov <[email protected]>
34
# Copyright (c) 2013-2014 Andrey Urusov <[email protected]>
45
#==============================================================================
56
# Welcome to the CMake build system for RDO STUDIO.
67
# This is the main file where we prepare the general build environment
78
# and provide build configuration options.
89
#==============================================================================
910

10-
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
11+
CMAKE_MINIMUM_REQUIRED(VERSION 3.20.0)
1112
CMAKE_POLICY(SET CMP0020 NEW)
1213
PROJECT(rdo)
1314

@@ -31,11 +32,23 @@ IF(NOT CMAKE_BUILD_TYPE)
3132
SET(CMAKE_BUILD_TYPE Debug)
3233
ENDIF()
3334

35+
IF(POLICY CMP0167)
36+
CMAKE_POLICY(SET CMP0167 NEW)
37+
ENDIF()
38+
39+
set(CMAKE_THREAD_LIBS_INIT "-lpthread")
40+
set(CMAKE_HAVE_THREADS_LIBRARY 1)
41+
set(CMAKE_USE_WIN32_THREADS_INIT 0)
42+
set(CMAKE_USE_PTHREADS_INIT 1)
43+
set(THREADS_PREFER_PTHREAD_FLAG ON)
44+
3445
ADD_DEFINITIONS(-DRDO_ST)
3546
ADD_DEFINITIONS(-DRDO_LIMIT_RES)
3647
ADD_DEFINITIONS(-DRDO_LICENSE_ACADEMIC)
3748
ADD_DEFINITIONS(-DNOMINMAX)
3849
ADD_DEFINITIONS(-DBOOST_SIGNALS_NO_DEPRECATION_WARNING)
50+
ADD_DEFINITIONS(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
51+
ADD_DEFINITIONS(-DBOOST_NO_CXX11_SMART_PTR)
3952

4053
# work with cmake
4154
SET(CMAKE_PREFIX_PATH $ENV{QTDIR}/lib/cmake)
@@ -45,6 +58,10 @@ SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
4558
INCLUDE(FindOS)
4659
INCLUDE(add.boost.test)
4760

61+
SET(CMAKE_CXX_STANDARD 14)
62+
SET(CMAKE_CXX_STANDARD_REQUIRED ON)
63+
set(CMAKE_CXX_EXTENSIONS OFF)
64+
4865
IF(MSVC)
4966
STRING(REGEX REPLACE /W[0-4] /W4 CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
5067
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
@@ -53,7 +70,7 @@ IF(MSVC)
5370
SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")
5471
SET(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /LTCG")
5572
ELSE()
56-
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++0x")
73+
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
5774
IF(MINGW)
5875
ADD_DEFINITIONS(-Wno-unused-local-typedefs)
5976
ELSE()
@@ -144,27 +161,31 @@ SET(GIT_RES_SHORT FALSE)
144161
SET(GIT_FILE_VERSION_LONG "${CMAKE_CURRENT_BINARY_DIR}/git.version.long")
145162
SET(GIT_FILE_VERSION_SHORT "${CMAKE_CURRENT_BINARY_DIR}/git.version.short")
146163

147-
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} describe --tags WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} RESULT_VARIABLE ${GIT_RES_LONG} OUTPUT_FILE ${GIT_FILE_VERSION_LONG})
148-
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} describe --abbrev=0 --tags WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} RESULT_VARIABLE ${GIT_RES_SHORT} OUTPUT_FILE ${GIT_FILE_VERSION_SHORT})
164+
# Похоже теги потерялись при переезде на github. Нужно доработать этот блок в будущем.
149165

150-
FILE(READ ${GIT_FILE_VERSION_LONG} READ_DATA_LONG)
151-
STRING(REPLACE "\n" "" GIT_VERSION_LONG ${READ_DATA_LONG})
166+
#EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} describe --tags WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} RESULT_VARIABLE ${GIT_RES_LONG} OUTPUT_FILE ${GIT_FILE_VERSION_LONG})
167+
#EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} describe --abbrev=0 --tags WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} RESULT_VARIABLE ${GIT_RES_SHORT} OUTPUT_FILE ${GIT_FILE_VERSION_SHORT})
152168

153-
FILE(READ ${GIT_FILE_VERSION_SHORT} READ_DATA_SHORT)
154-
STRING(REPLACE "\n" "" GIT_VERSION_SHORT ${READ_DATA_SHORT})
169+
#FILE(READ ${GIT_FILE_VERSION_LONG} READ_DATA_LONG)
170+
#STRING(REPLACE "\n" "" GIT_VERSION_LONG ${READ_DATA_LONG})
171+
172+
#FILE(READ ${GIT_FILE_VERSION_SHORT} READ_DATA_SHORT)
173+
#STRING(REPLACE "\n" "" GIT_VERSION_SHORT ${READ_DATA_SHORT})
174+
175+
set(GIT_VERSION_LONG "v0.0.0_github")
176+
set(GIT_VERSION_SHORT "v0.0.0_github")
155177

156178
MESSAGE(STATUS "rdo version : ${GIT_VERSION_LONG}")
157179

158-
STRING(LENGTH "${GIT_VERSION_LONG}" TEMP_LENGTH)
159-
STRING(SUBSTRING "${GIT_VERSION_LONG}" 1 -1 GIT_VERSION_LONG_NUM)
180+
#STRING(LENGTH "${GIT_VERSION_LONG}" TEMP_LENGTH)
181+
#STRING(SUBSTRING "${GIT_VERSION_LONG}" 1 -1 GIT_VERSION_LONG_NUM)
160182

161-
STRING(LENGTH "${GIT_VERSION_SHORT}" TEMP_LENGTH)
162-
STRING(SUBSTRING "${GIT_VERSION_SHORT}" 1 -1 GIT_VERSION_SHORT_NUM)
183+
#STRING(LENGTH "${GIT_VERSION_SHORT}" TEMP_LENGTH)
184+
#STRING(SUBSTRING "${GIT_VERSION_SHORT}" 1 -1 GIT_VERSION_SHORT_NUM)
163185

164186
SET(GIT_VERSION ${GIT_VERSION_SHORT})
165187

166188
#==============================================================================
167-
168189
SET(PROJECT_VERSION ${GIT_VERSION_SHORT})
169190
SET(PROJECT_VERSION_LONG ${GIT_VERSION_LONG} )
170191

@@ -306,4 +327,4 @@ SET(CPACK_RPM_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION}")
306327
SET(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME_LOWER}_${PROJECT_VERSION}_${CMAKE_SYSTEM_PROCESSOR}")
307328

308329
INCLUDE(CPack)
309-
INCLUDE(Documentation)
330+
#INCLUDE(Documentation)

‎app/rdo_studio/plugins/game5/src/plugin_game5_graph_node_info_dialog.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// ----------------------------------------------------------------------- INCLUDES
33
#include "utils/src/common/warning_disable.h"
44
#include "utils/src/common/warning_enable.h"
5+
#include <QStyle>
56
// ----------------------------------------------------------------------- SYNOPSIS
67
#include "app/rdo_studio/plugins/game5/src/plugin_game5_graph_node_info_dialog.h"
78
// --------------------------------------------------------------------------------

‎app/rdo_studio/plugins/game5/src/plugin_game5_tiles_order_dialog.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include "utils/src/common/warning_disable.h"
44
#include <vector>
55
#include "utils/src/common/warning_enable.h"
6+
#include <QRegExpValidator>
67
// ----------------------------------------------------------------------- SYNOPSIS
78
#include "app/rdo_studio/plugins/game5/src/plugin_game5_tiles_order_dialog.h"
89
// --------------------------------------------------------------------------------

‎app/rdo_studio/src/dialog/goto_line_dialog.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// ---------------------------------------------------------------------------- PCH
22
#include "app/rdo_studio/pch/application_pch.h"
33
// ----------------------------------------------------------------------- INCLUDES
4+
#include <QIntValidator>
45
// ----------------------------------------------------------------------- SYNOPSIS
56
#include "app/rdo_studio/src/dialog/goto_line_dialog.h"
67
// --------------------------------------------------------------------------------

‎app/rdo_studio/src/main_window.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Q_OBJECT
111111
void removeLastSubWindow();
112112
};
113113

114-
std::auto_ptr<SubWindowToAction> m_subWindowToAction;
114+
std::unique_ptr<SubWindowToAction> m_subWindowToAction;
115115
int m_updateTimerID;
116116
LPStatusBar m_pStatusBar;
117117
ReopenList m_reopenList;

‎app/rdo_studio/src/tracer/chart/chart_view.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <QProcess>
77
#include <QEvent>
88
#include <QClipboard>
9+
#include <QPainterPath>
910
#include "utils/src/common/warning_enable.h"
1011
// ----------------------------------------------------------------------- SYNOPSIS
1112
#include "app/rdo_studio/src/tracer/chart/chart_view.h"

‎app/rdo_studio/src/tracer/tracer_serie.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// ----------------------------------------------------------------------- INCLUDES
44
#include <algorithm>
55
#include <boost/bind.hpp>
6+
#include <QPainterPath>
67
// ----------------------------------------------------------------------- SYNOPSIS
78
#include "app/rdo_studio/src/tracer/tracer_serie.h"
89
#include "app/rdo_studio/src/tracer/tracer_values.h"

‎converter/smr2rdox/rdoparser.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ RDOParserModel::Result RDOParserModel::convert(const boost::filesystem::path& sm
324324
RDOParserSMRInfo::FileList fileList;
325325
boost::filesystem::path modelName;
326326
{
327-
std::auto_ptr<RDOParserSMRInfo> pSMRParser(new RDOParserSMRInfo());
327+
std::unique_ptr<RDOParserSMRInfo> pSMRParser(new RDOParserSMRInfo());
328328

329329
try
330330
{

‎converter/smr2rdox/rdorss.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ rdo::runtime::LPRDOCalc RDORSSResource::createCalc() const
9999
// --------------------------------------------------------------------------------
100100
// -------------------- RDOPROCResource
101101
// --------------------------------------------------------------------------------
102-
RDOPROCResource::RDOPROCResource(Converter* pParser, const RDOParserSrcInfo& src_info, const LPRDORTPResType& pResType, int id)
102+
RDOPROCResource::RDOPROCResource(Converter* pParser, const RDOParserSrcInfo& src_info, const LPRDORTPResType& pResType, std::size_t id)
103103
: RDORSSResource(pParser, src_info, pResType, id)
104104
{}
105105

0 commit comments

Comments
 (0)