-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add a feature of team graphic scaling (#21) * Add a feature to change the draw scale of team graphic images. * add a command line option, '--team-graphic-scale' * Improve cmake settings (#22) Co-authored-by: Hidehisa Akiyama <[email protected]> * fix a compiler warning caused by illegal strncpy usage. (#23) * Release 16.1.0 (#24) * update a minor version number. * update copyright notice message. Co-authored-by: Hidehisa Akiyama <[email protected]>
- Loading branch information
1 parent
a555894
commit 6017d1d
Showing
13 changed files
with
220 additions
and
114 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,99 +1,55 @@ | ||
cmake_minimum_required(VERSION 3.5) | ||
|
||
project(rcssmonitor VERSION 16.0.0) | ||
|
||
add_definitions(-DPACKAGE_NAME=\"rcssmonitor\") | ||
add_definitions(-DVERSION=\"16.0.0\") | ||
|
||
set(CMAKE_CXX_STANDARD 14) | ||
set(CMAKE_CXX_STANDARD_REQUIRED True) | ||
|
||
set(CMAKE_AUTOMOC ON) | ||
project(rcssmonitor VERSION 16.1.0) | ||
|
||
if(CMAKE_VERSION VERSION_LESS "3.7.0") | ||
set(CMAKE_INCLUDE_CURRENT_DIR ON) | ||
endif() | ||
|
||
find_package(Boost 1.36.0 COMPONENTS program_options system REQUIRED) | ||
# compiler options | ||
set(CMAKE_CXX_STANDARD 14) | ||
set(CMAKE_CXX_STANDARD_REQUIRED ON) | ||
|
||
find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED) | ||
if(NOT Qt5_FOUND) | ||
find_package(Qt4 4.1.0 COMPONENTS QtCore QtGui QtNetwork REQUIRED) | ||
if(NOT Qt4_FOUND) | ||
message(FATAL_ERROR "Qt not found!") | ||
endif() | ||
if(NOT CMAKE_BUILD_TYPE) | ||
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE) | ||
endif() | ||
set(CMAKE_CXX_FLAGS "-W -Wall") | ||
|
||
find_package(ZLIB) | ||
|
||
option(HAVE_NETINET_IN_H "use netinet/in.h" ON) | ||
if(HAVE_NETINET_IN_H) | ||
add_definitions(-DHAVE_NETINET_IN_H) | ||
endif() | ||
include(GNUInstallDirs) | ||
|
||
option(HAVE_WINDOWS_H "use windows.h" OFF) | ||
if(HAVE_WINDOWS_H) | ||
add_definitions(-DHAVE_WINDOWS_H) | ||
# check header files | ||
include(CheckIncludeFileCXX) | ||
if(WIN32) | ||
check_include_file("windows.h" HAVE_WINDOWS_H) | ||
endif() | ||
check_include_file_cxx("netinet/in.h" HAVE_NETINET_IN_H) | ||
|
||
# check boost | ||
find_package(Boost 1.38.0 COMPONENTS program_options system REQUIRED) | ||
if(Boost_PROGRAM_OPTIONS_FOUND) | ||
# message( "found boost::program_options") | ||
add_definitions(-DHAVE_BOOST_PROGRAM_OPTIONS) | ||
set(HAVE_BOOST_PROGRAM_OPTIONS TRUE) | ||
endif() | ||
|
||
if(ZLIB_FOUND) | ||
add_definitions(-DHAVE_LIBZ) | ||
# check Qt | ||
find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED) | ||
if(NOT Qt5_FOUND) | ||
message(FATAL_ERROR "Qt5 not found!") | ||
endif() | ||
|
||
add_executable(rcssmonitor | ||
src/rcsslogplayer/gzfstream.cpp | ||
src/rcsslogplayer/parser.cpp | ||
src/rcsslogplayer/types.cpp | ||
src/rcsslogplayer/util.cpp | ||
src/angle_deg.cpp | ||
src/ball_painter.cpp | ||
src/circle_2d.cpp | ||
src/config_dialog.cpp | ||
src/disp_holder.cpp | ||
src/draw_info_painter.cpp | ||
src/field_canvas.cpp | ||
src/field_painter.cpp | ||
src/line_2d.cpp | ||
src/log_player.cpp | ||
src/log_player_slider.cpp | ||
src/main_window.cpp | ||
src/monitor_client.cpp | ||
src/options.cpp | ||
src/player_painter.cpp | ||
src/player_type_dialog.cpp | ||
src/score_board_painter.cpp | ||
src/team_graphic.cpp | ||
src/team_graphic_painter.cpp | ||
src/vector_2d.cpp | ||
src/main.cpp | ||
) | ||
|
||
target_include_directories(rcssmonitor PUBLIC | ||
"${PROJECT_BINARY_DIR}" | ||
"${Boost_INCLUDE_DIRS}" | ||
"${ZLIB_INCLUDE_DIRS}" | ||
"${PROJECT_SOURCE_DIR}" | ||
"${PROJECT_SOURCE_DIR}/src" | ||
) | ||
set(CMAKE_AUTOMOC ON) | ||
|
||
if(Qt5_FOUND) | ||
target_link_libraries(rcssmonitor | ||
Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network | ||
Boost::program_options Boost::system | ||
ZLIB::ZLIB | ||
) | ||
elseif(Qt4_FOUND) | ||
target_link_libraries(rcssmonitor | ||
Qt4::QtCore Qt4::QtGui Qt4::QtNetwork | ||
Boost::program_options Boost::system | ||
ZLIB::ZLIB | ||
) | ||
# check zlib | ||
find_package(ZLIB) | ||
if(ZLIB_FOUND) | ||
set(HAVE_LIBZ TRUE) | ||
endif() | ||
|
||
# generate config.h | ||
add_definitions(-DHAVE_CONFIG_H) | ||
configure_file( | ||
${PROJECT_SOURCE_DIR}/cmake-config.h.in | ||
${PROJECT_BINARY_DIR}/config.h | ||
) | ||
|
||
install(TARGETS rcssmonitor DESTINATION bin) | ||
# | ||
add_subdirectory(src) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,10 @@ | ||
2022-01-21 Hidehisa Akiyama <[email protected]> | ||
|
||
* CMakeLists.txt: | ||
* NEWS: | ||
* configurea.ac: | ||
- updated a minor version number. Official release 16.1.0. | ||
|
||
2020-03-11 Hidehisa Akiyama <[email protected]> | ||
|
||
* NEWS: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
|
||
#define PACKAGE_NAME "rcssmonitor" | ||
|
||
#define VERSION "@rcssmonitor_VERSION@" | ||
|
||
#cmakedefine HAVE_LIBZ | ||
|
||
#cmakedefine HAVE_WINDOWS_H | ||
|
||
#cmakedefine HAVE_NETINET_IN_H | ||
|
||
#cmakedefine HAVE_BOOST_PROGRAM_OPTIONS |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
|
||
add_executable(rcssmonitor | ||
rcsslogplayer/gzfstream.cpp | ||
rcsslogplayer/parser.cpp | ||
rcsslogplayer/types.cpp | ||
rcsslogplayer/util.cpp | ||
angle_deg.cpp | ||
ball_painter.cpp | ||
circle_2d.cpp | ||
config_dialog.cpp | ||
disp_holder.cpp | ||
draw_info_painter.cpp | ||
field_canvas.cpp | ||
field_painter.cpp | ||
line_2d.cpp | ||
log_player.cpp | ||
log_player_slider.cpp | ||
main_window.cpp | ||
monitor_client.cpp | ||
options.cpp | ||
player_painter.cpp | ||
player_type_dialog.cpp | ||
score_board_painter.cpp | ||
team_graphic.cpp | ||
team_graphic_painter.cpp | ||
vector_2d.cpp | ||
main.cpp | ||
) | ||
|
||
target_include_directories(rcssmonitor | ||
PUBLIC | ||
${Qt5Core_INCLUDE_DIRS} | ||
${Qt5Gui_INCLUDE_DIRS} | ||
${Qt5Widgets_INCLUDE_DIRS} | ||
${Qt5Network_INCLUDE_DIRS} | ||
${Boost_INCLUDE_DIRS} | ||
${ZLIB_INCLUDE_DIRS} | ||
PRIVATE | ||
${PROJECT_BINARY_DIR} | ||
${PROJECT_SOURCE_DIR} | ||
${PROJECT_SOURCE_DIR}/src | ||
) | ||
|
||
target_link_libraries(rcssmonitor | ||
Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network | ||
Boost::program_options Boost::system | ||
ZLIB::ZLIB | ||
) | ||
|
||
target_compile_definitions(rcssmonitor | ||
PUBLIC | ||
HAVE_CONFIG_H | ||
) | ||
|
||
install(TARGETS rcssmonitor | ||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.