d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Be compatible with cmake 3.1

Browse source
This commit is contained in:
Konstantinos Sideris 2018-03-22 16:34:11 +02:00
parent f77a103209
commit 8a2b29a3bf
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -103,7 +103,6 @@ set(PROJECT_VERSION ${CPACK_PACKAGE_VERSION})
message(STATUS "Version: ${PROJECT_VERSION}") message(STATUS "Version: ${PROJECT_VERSION}")
cmake_host_system_information(RESULT BUILD_HOST QUERY HOSTNAME) cmake_host_system_information(RESULT BUILD_HOST QUERY HOSTNAME)
cmake_host_system_information(RESULT BUILD_OS QUERY OS_NAME)
set(BUILD_USER $ENV{USER}) set(BUILD_USER $ENV{USER})
configure_file(cmake/version.hpp config/version.hpp) configure_file(cmake/version.hpp config/version.hpp)

2
cmake/version.hpp
View file

@ -1,5 +1,5 @@
namespace nheko { namespace nheko {
static constexpr const char *version = "${PROJECT_VERSION}"; static constexpr const char *version = "${PROJECT_VERSION}";
static constexpr const char *build_user = "${BUILD_USER}@${BUILD_HOST}"; static constexpr const char *build_user = "${BUILD_USER}@${BUILD_HOST}";
static constexpr const char *build_os = "${BUILD_OS}"; static constexpr const char *build_os = "${CMAKE_HOST_SYSTEM_NAME}";
} }

2
include/Config.h
View file

@ -58,7 +58,7 @@ namespace roomlist {
namespace fonts { namespace fonts {
static constexpr int heading = 13; static constexpr int heading = 13;
static constexpr int timestamp = heading; static constexpr int timestamp = heading;
static constexpr int badge = 9; static constexpr int badge = 10;
static constexpr int bubble = 20; static constexpr int bubble = 20;
} // namespace fonts } // namespace fonts
} // namespace roomlist } // namespace roomlist