From 9ead7ba71690e778d2f71d6bd00d016a530ea622 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 4 Dec 2019 21:34:25 +0000 Subject: [PATCH] Use primitives instead of relying on custom variable --- cmake/modules/GrantleeMacros.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/modules/GrantleeMacros.cmake b/cmake/modules/GrantleeMacros.cmake index 66d84e59..3a3d3e86 100644 --- a/cmake/modules/GrantleeMacros.cmake +++ b/cmake/modules/GrantleeMacros.cmake @@ -4,16 +4,16 @@ include(CMakeParseArguments) macro(grantlee_adjust_plugin_name pluginname) set_target_properties(${pluginname} PROPERTIES PREFIX "" - LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING}" - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING}" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}" + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}" DEBUG_POSTFIX "d" ) foreach(cfg ${CMAKE_CONFIGURATION_TYPES}) string(TOUPPER ${cfg} CFG) set_target_properties(${pluginname} PROPERTIES - LIBRARY_OUTPUT_DIRECTORY_${CFG} "${CMAKE_BINARY_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING}" - RUNTIME_OUTPUT_DIRECTORY_${CFG} "${CMAKE_BINARY_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING}" + LIBRARY_OUTPUT_DIRECTORY_${CFG} "${CMAKE_BINARY_DIR}/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}" + RUNTIME_OUTPUT_DIRECTORY_${CFG} "${CMAKE_BINARY_DIR}/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}" ) endforeach() endmacro()