From 2e35cd356e90b711632c4d1b76506e57e782865d Mon Sep 17 00:00:00 2001 From: arcan1s Date: Mon, 14 Jul 2014 14:22:04 +0400 Subject: [PATCH] edited cmake files --- sources/CMakeLists.txt | 6 +++++- sources/gui/src/CMakeLists.txt | 6 ------ sources/netctlgui/src/CMakeLists.txt | 3 --- sources/resources/CMakeLists.txt | 2 +- sources/version.h.in | 5 +++-- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 73eb2c8..230a4f9 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 3.0) cmake_policy (SET CMP0003 OLD) cmake_policy (SET CMP0002 OLD) @@ -10,9 +10,13 @@ set (PROJECT_VERSION_MAJOR 1) set (PROJECT_VERSION_MINOR 2) set (PROJECT_VERSION_PATCH 0) set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) +string (TIMESTAMP CURRENT_DATE UTC) +string (TIMESTAMP CURRENT_YEAR "%Y") configure_file (${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h) +message (STATUS "Project: ${PROJECT_NAME}") message (STATUS "Version: ${PROJECT_VERSION}") +message (STATUS "Build date: ${CURRENT_DATE}") # install options option (USE_QT5 "Use Qt5 instead of Qt4" ON) diff --git a/sources/gui/src/CMakeLists.txt b/sources/gui/src/CMakeLists.txt index 7074ee1..3201e1f 100644 --- a/sources/gui/src/CMakeLists.txt +++ b/sources/gui/src/CMakeLists.txt @@ -6,10 +6,6 @@ file (GLOB FORMS *.ui) file (GLOB LANGUAGES ${SUBPROJECT_TRANSLATION_DIR}/*.ts) set (RESOURCES ${SUBPROJECT_RESOURCE_DIR}/resources.qrc) -message (STATUS "${SUBPROJECT} Sources: ${SOURCES}") -message (STATUS "${SUBPROJECT} Headers: ${HEADERS}") -message (STATUS "${SUBPROJECT} Forms: ${FORMS}") - # include_path include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../${PROJECT_LIBRARY}/include/ ${CMAKE_CURRENT_BINARY_DIR}/../ @@ -38,7 +34,6 @@ if (USE_QT5) endforeach () add_custom_target (translations COMMAND ${Qt5_LUPDATE_EXECUTABLE} ${HEADERS} ${SOURCES} ${UI_HEADERS} -ts ${TRANSLATIONS}) add_custom_command (TARGET translations COMMAND ${Qt5_LRELEASE_EXECUTABLE} ${TRANSLATIONS}) - message (STATUS "${SUBPROJECT} Translations: ${TRANSLATIONS_BINARY}") source_group ("Header Files" FILES ${HEADERS}) source_group ("Source Files" FILES ${SOURCES}) @@ -63,7 +58,6 @@ else () endforeach () add_custom_target (translations COMMAND ${QT_LUPDATE_EXECUTABLE} ${HEADERS} ${SOURCES} ${UI_HEADERS} -ts ${TRANSLATIONS}) add_custom_command (TARGET translations COMMAND ${QT_LRELEASE_EXECUTABLE} ${TRANSLATIONS}) - message (STATUS "${SUBPROJECT} Translations: ${TRANSLATIONS_BINARY}") source_group ("Header Files" FILES ${HEADERS}) source_group ("Source Files" FILES ${SOURCES}) diff --git a/sources/netctlgui/src/CMakeLists.txt b/sources/netctlgui/src/CMakeLists.txt index a7d03d2..8d85a59 100644 --- a/sources/netctlgui/src/CMakeLists.txt +++ b/sources/netctlgui/src/CMakeLists.txt @@ -2,9 +2,6 @@ file (GLOB SOURCES *.cpp) file (GLOB HEADERS ${SUBPROJECT_INCLUDE_DIR}/${SUBPROJECT}/*.h) -message (STATUS "${SUBPROJECT} Sources: ${SOURCES}") -message (STATUS "${SUBPROJECT} Headers: ${HEADERS}") - # include_path include_directories (${SUBPROJECT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../ diff --git a/sources/resources/CMakeLists.txt b/sources/resources/CMakeLists.txt index a8a579e..dcbd7ba 100644 --- a/sources/resources/CMakeLists.txt +++ b/sources/resources/CMakeLists.txt @@ -1,5 +1,5 @@ # set project name -set (SUBPROJECT netctl-gui-icons) +set (SUBPROJECT netctl-gui-resources) message (STATUS "Subproject ${SUBPROJECT}") if (BUILD_GUI) diff --git a/sources/version.h.in b/sources/version.h.in index 8003264..2b0ca6d 100644 --- a/sources/version.h.in +++ b/sources/version.h.in @@ -2,8 +2,9 @@ #define VERSION_H #define AUTHOR "Evgeniy Alekseev" -#define DATE "2014-2014" -#define NAME "Netctl plasmoid" +#define BUILD_DATE "@CURRENT_DATE@" +#define DATE "2014-@CURRENT_YEAR@" +#define NAME "Netctl Graphical Interface" #define VERSION "@PROJECT_VERSION@" #endif /* VERSION_H */