Use primitives instead of relying on custom variable

steveire · Dec 4, 2019 · 9ead7ba · 9ead7ba
1 parent b5a67ac
commit 9ead7ba
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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()