diff options
| author | Alex Merry <alex.merry@kde.org> | 2015-01-10 17:15:33 +0000 |
|---|---|---|
| committer | Alex Merry <alex.merry@kde.org> | 2015-01-14 22:18:42 +0000 |
| commit | 1dd2029e5585385ea42d3092b010a8879ff00201 (patch) | |
| tree | 24ba53f9d1b1f8748d520281e56b84096ea4ff3b | |
| parent | 8b24ae53823a516144d15a10abcee644c4b15354 (diff) | |
| download | extra-cmake-modules-1dd2029e5585385ea42d3092b010a8879ff00201.tar.gz extra-cmake-modules-1dd2029e5585385ea42d3092b010a8879ff00201.tar.bz2 | |
Fix CMP0053 warning with CMake 3.1.
With CMake 3.1, @-style variable expansion is deprecated outside of
configure_file() or string(CONFIGURE) contexts (CMP0053). This causes
ecm_generate_pri_file() to produce dev warnings with this verison of
CMake, and would break this function in projects that set CMake 3.1 as
their required version.
REVIEW: 121971
| -rw-r--r-- | modules/ECMGeneratePriFile.cmake | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/modules/ECMGeneratePriFile.cmake b/modules/ECMGeneratePriFile.cmake index b353e867..3a409723 100644 --- a/modules/ECMGeneratePriFile.cmake +++ b/modules/ECMGeneratePriFile.cmake @@ -156,16 +156,16 @@ function(ECM_GENERATE_PRI_FILE) file(GENERATE OUTPUT ${PRI_FILENAME} CONTENT - "QT.@PRI_TARGET_BASENAME@.VERSION = @PROJECT_VERSION_STRING@ -QT.@PRI_TARGET_BASENAME@.MAJOR_VERSION = @PROJECT_VERSION_MAJOR@ -QT.@PRI_TARGET_BASENAME@.MINOR_VERSION = @PROJECT_VERSION_MINOR@ -QT.@PRI_TARGET_BASENAME@.PATCH_VERSION = @PROJECT_VERSION_PATCH@ -QT.@PRI_TARGET_BASENAME@.name = @PRI_TARGET_LIBNAME@ -QT.@PRI_TARGET_BASENAME@.defines = @PRI_TARGET_DEFINES@ -QT.@PRI_TARGET_BASENAME@.includes = @PRI_TARGET_INCLUDES@ -QT.@PRI_TARGET_BASENAME@.private_includes = -QT.@PRI_TARGET_BASENAME@.libs = @PRI_TARGET_LIBS@ -QT.@PRI_TARGET_BASENAME@.depends = @PRI_TARGET_QTDEPS@ + "QT.${PRI_TARGET_BASENAME}.VERSION = ${PROJECT_VERSION_STRING} +QT.${PRI_TARGET_BASENAME}.MAJOR_VERSION = ${PROJECT_VERSION_MAJOR} +QT.${PRI_TARGET_BASENAME}.MINOR_VERSION = ${PROJECT_VERSION_MINOR} +QT.${PRI_TARGET_BASENAME}.PATCH_VERSION = ${PROJECT_VERSION_PATCH} +QT.${PRI_TARGET_BASENAME}.name = ${PRI_TARGET_LIBNAME} +QT.${PRI_TARGET_BASENAME}.defines = ${PRI_TARGET_DEFINES} +QT.${PRI_TARGET_BASENAME}.includes = ${PRI_TARGET_INCLUDES} +QT.${PRI_TARGET_BASENAME}.private_includes = +QT.${PRI_TARGET_BASENAME}.libs = ${PRI_TARGET_LIBS} +QT.${PRI_TARGET_BASENAME}.depends = ${PRI_TARGET_QTDEPS} " ) endfunction() |