Some cmake cleanup.

This commit is contained in:
Jim Evins
2017-02-26 16:26:40 -05:00
parent 95467b6ed2
commit c363c340ce
6 changed files with 34 additions and 31 deletions
+24 -2
View File
@@ -1,9 +1,9 @@
cmake_minimum_required (VERSION 2.8.12) 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 (templates)
add_subdirectory (data) 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()
-7
View File
@@ -1,10 +1,3 @@
cmake_minimum_required (VERSION 2.8.12)
###############################################################################
# gLabels data subproject
###############################################################################
project (data)
#======================================= #=======================================
# Install # Install
#======================================= #=======================================
-8
View File
@@ -1,11 +1,3 @@
cmake_minimum_required (VERSION 2.8.12)
###############################################################################
# gLabels application subproject
###############################################################################
project (app CXX)
#======================================= #=======================================
# Compilation # Compilation
#======================================= #=======================================
+1 -1
View File
@@ -27,7 +27,7 @@ namespace glabels
namespace Config namespace Config
{ {
const QString PROJECT_SOURCE_DIR = "@glabels_qt_SOURCE_DIR@"; const QString PROJECT_SOURCE_DIR = "@glabels_SOURCE_DIR@";
} }
} }
+4 -1
View File
@@ -22,8 +22,10 @@
#define glabels_Version_h #define glabels_Version_h
namespace Version namespace glabels
{ {
namespace Version
{
const QString WEBSITE = "@Website@"; const QString WEBSITE = "@Website@";
const int MAJOR = @Major_Version@; const int MAJOR = @Major_Version@;
@@ -31,6 +33,7 @@ namespace Version
const int MICRO = @Micro_Version@; const int MICRO = @Micro_Version@;
const QString STRING = "@Full_Version@"; const QString STRING = "@Full_Version@";
}
} }
-7
View File
@@ -1,10 +1,3 @@
cmake_minimum_required (VERSION 2.8.12)
###############################################################################
# gLabels templates subproject
###############################################################################
project (templates)
#======================================= #=======================================
# Template Files # Template Files
#======================================= #=======================================