diff --git a/CMakeLists.txt b/CMakeLists.txt index dd4fbb6..ba67f57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required (VERSION 2.8.12) ############################################################################### -# Top-Level gLabels project +# gLabels Label Designer Project ############################################################################### -project (glabels_qt) +project (glabels) #======================================= @@ -41,3 +41,25 @@ add_subdirectory (glabels) add_subdirectory (templates) add_subdirectory (data) + +#======================================= +# Print configuration information +#======================================= +message (STATUS "") +message (STATUS "Project name ............ " ${CMAKE_PROJECT_NAME}) +message (STATUS "Project version ......... " ${Full_Version}) +message (STATUS "Installation prefix ..... " ${CMAKE_INSTALL_PREFIX}) +message (STATUS "Source code location .... " ${glabels_SOURCE_DIR}) +message (STATUS "C++ Compiler ............ " ${CMAKE_CXX_COMPILER_ID} " " ${CMAKE_CXX_COMPILER} " " ${CMAKE_CXX_COMPILER_VERSION}) +message (STATUS "Qt version .............. " ${Qt5Core_VERSION}) +message (STATUS "zlib version ............ " ${ZLIB_VERSION_STRING}) +message (STATUS "") + +# +# Uncomment to print all CMake variables +# +# get_cmake_property(_variableNames VARIABLES) +# foreach (_variableName ${_variableNames}) +# message(STATUS "${_variableName}=${${_variableName}}") +# endforeach() + diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 98755a7..0eb584e 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,10 +1,3 @@ -cmake_minimum_required (VERSION 2.8.12) - -############################################################################### -# gLabels data subproject -############################################################################### -project (data) - #======================================= # Install #======================================= diff --git a/glabels/CMakeLists.txt b/glabels/CMakeLists.txt index 39b76ac..df4c773 100644 --- a/glabels/CMakeLists.txt +++ b/glabels/CMakeLists.txt @@ -1,11 +1,3 @@ -cmake_minimum_required (VERSION 2.8.12) - -############################################################################### -# gLabels application subproject -############################################################################### -project (app CXX) - - #======================================= # Compilation #======================================= diff --git a/glabels/Config.h.in b/glabels/Config.h.in index 22e95c8..78b85c5 100644 --- a/glabels/Config.h.in +++ b/glabels/Config.h.in @@ -27,7 +27,7 @@ namespace glabels namespace Config { - const QString PROJECT_SOURCE_DIR = "@glabels_qt_SOURCE_DIR@"; + const QString PROJECT_SOURCE_DIR = "@glabels_SOURCE_DIR@"; } } diff --git a/glabels/Version.h.in b/glabels/Version.h.in index ea3ae64..be7b2d4 100644 --- a/glabels/Version.h.in +++ b/glabels/Version.h.in @@ -22,15 +22,18 @@ #define glabels_Version_h -namespace Version +namespace glabels { - const QString WEBSITE = "@Website@"; + namespace Version + { + const QString WEBSITE = "@Website@"; - const int MAJOR = @Major_Version@; - const int MINOR = @Minor_Version@; - const int MICRO = @Micro_Version@; + const int MAJOR = @Major_Version@; + const int MINOR = @Minor_Version@; + const int MICRO = @Micro_Version@; - const QString STRING = "@Full_Version@"; + const QString STRING = "@Full_Version@"; + } } diff --git a/templates/CMakeLists.txt b/templates/CMakeLists.txt index 085cbb7..7576bfe 100644 --- a/templates/CMakeLists.txt +++ b/templates/CMakeLists.txt @@ -1,10 +1,3 @@ -cmake_minimum_required (VERSION 2.8.12) - -############################################################################### -# gLabels templates subproject -############################################################################### -project (templates) - #======================================= # Template Files #=======================================