summary refs log tree commit diff
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-03-22 16:34:11 +0200
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-03-22 16:34:11 +0200
commit8a2b29a3bfdf163f298b7e90a71fc5e86429b209 (patch)
tree5952efedbdc35626aa968c2ae3ecf8a29cb860cb
parentAdd version info in the settings menu (diff)
downloadnheko-8a2b29a3bfdf163f298b7e90a71fc5e86429b209.tar.xz
Be compatible with cmake 3.1
-rw-r--r--CMakeLists.txt1
-rw-r--r--cmake/version.hpp2
-rw-r--r--include/Config.h2
3 files changed, 2 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt

index 631cac8e..91e1852d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -103,7 +103,6 @@ set(PROJECT_VERSION ${CPACK_PACKAGE_VERSION}) message(STATUS "Version: ${PROJECT_VERSION}") cmake_host_system_information(RESULT BUILD_HOST QUERY HOSTNAME) -cmake_host_system_information(RESULT BUILD_OS QUERY OS_NAME) set(BUILD_USER $ENV{USER}) configure_file(cmake/version.hpp config/version.hpp) diff --git a/cmake/version.hpp b/cmake/version.hpp
index 272e84ac..204bc895 100644 --- a/cmake/version.hpp +++ b/cmake/version.hpp
@@ -1,5 +1,5 @@ namespace nheko { static constexpr const char *version = "${PROJECT_VERSION}"; 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}"; } diff --git a/include/Config.h b/include/Config.h
index 33cc63f7..54b2aa61 100644 --- a/include/Config.h +++ b/include/Config.h
@@ -58,7 +58,7 @@ namespace roomlist { namespace fonts { static constexpr int heading = 13; static constexpr int timestamp = heading; -static constexpr int badge = 9; +static constexpr int badge = 10; static constexpr int bubble = 20; } // namespace fonts } // namespace roomlist